Commit Graph

6801 Commits

Author SHA1 Message Date
Treehugger Robot
6afb115dea Merge "Allow protoc-gen-javastream to build statically" 2019-10-14 23:42:23 +00:00
Ryan Mitchell
055e6189f9 Allow protoc-gen-javastream to build statically
protoc-gen-javastream is failing to build for the static_sdk_tools
build target. This is because libprotoc is included as a shared
library in the protoc-gen-javastream target. Link libprotoc statically
to allow for the sdk tools to build.

Bug: 142536936
Test: m -j protoc-gen-javastream BUILD_HOST_static=1
Change-Id: I53e1263c774530f36ff16ab8dada3e0e715e63e0
2019-10-14 10:06:26 -07:00
Adrian Roos
ab911951ae Merge "apilint: suppress certain nullability lints" 2019-10-10 13:41:16 +00:00
Ryan Mitchell
ac55e41f24 Fix memory leak in aapt2
Fix a memory leak in Main.cpp.

Bug: 141312058
Test: m -j aapt2 SANITIZE_TARGET=address
Change-Id: I54b61792ab75e2f59298dd38168653e496c84bff
2019-09-25 16:26:29 +00:00
Steven Moreland
2700afda04 aapt2: disable leak detection
When building with SANATIZE_HOST=address and ASAN_OPTIONS="" in order to
test that leaks are removed from AIDL, was hitting leaks here.
Explicitly setting ASAN_OPTIONS here so that we can detect leaks in
other host tools.

Bug: 141312058
Test: AIDL's runtests_asan.sh
Change-Id: Ibc599ab75bbf63eab1c7747d17952390a7967e87
2019-09-19 18:18:23 +00:00
Ian Kasprzak
fc005b8d7c Revert "[DO NOT MERGE] Disable com.android.preload.check.PreloadCheck#testBlackList"
This reverts commit 869b473388.

Reason for revert: Test is fixed.

Change-Id: I7f305f428a0f39a09e0d31512e4efa752e39b1bd
2019-08-29 04:12:55 +00:00
Ian Kasprzak
869b473388 [DO NOT MERGE] Disable com.android.preload.check.PreloadCheck#testBlackList
Disabling in preparation for merge to aosp-master (Q release).

Test: Forrest - go/forrest_run/L13300000358776692
BUG: 139540082
BUG: 139305203
Change-Id: I2da5daf011bfe44648aa6e3cc969db2689d79b76
2019-08-27 22:32:08 +00:00
Dan Shi
6bbd7c4cc6 Merge "Fix dependency on APK used by test"
am: 85d2ac2e12

Change-Id: I1ae6bff68d4aa4890fee47b5943e4d3420c32ed2
2019-08-05 14:19:06 -07:00
Treehugger Robot
85d2ac2e12 Merge "Fix dependency on APK used by test" 2019-08-05 21:04:28 +00:00
Oliver Nguyen
a1e96c644e Merge "Change coverage dump to specify the output file instead of directory."
am: f0723588de

Change-Id: Icc1b87d3fcb318adc1b10569d0a60180452f0a5b
2019-07-29 13:35:16 -07:00
Oliver Nguyen
f0723588de Merge "Change coverage dump to specify the output file instead of directory." 2019-07-29 17:37:30 +00:00
Dan Shi
bcef6ae6bc Fix dependency on APK used by test
Use data attribute to include the APK used for the test.

Bug: 138416078
Test: atest
Change-Id: Iffeca6c5f487c6a164acb9c880a5b6405eff424d
2019-07-26 14:16:43 -07:00
Paul Duffin
321ac12abe Merge "Remove preload2 as it is not used"
am: c9f969486c

Change-Id: Ib6021811cc9833d98fca15e6dc99b7d9b0dcd0a6
2019-07-25 08:13:49 -07:00
Paul Duffin
0dec38029b Remove preload2 as it is not used
Bug: 137634816
Test: m checkbuild
Change-Id: Ib182a53bc4b7509d725a8bc24a691b1cec90f726
2019-07-25 09:19:52 +01:00
Oliver Nguyen
05b1c06a91 Change coverage dump to specify the output file instead of directory.
Bug: 137857876
Test: manual
Change-Id: I2d835856d7a1b6b1ded561eca923f455b39317e4
2019-07-18 10:46:05 -07:00
Paul Duffin
83d403b80a Merge "Remove libnativehelper directories from include_dirs"
am: 0a79f4476a

Change-Id: I1909ab2777d790d62f16aa6d021fa8001188068b
2019-07-16 12:41:17 -07:00
Paul Duffin
f3b039f1b6 Remove libnativehelper directories from include_dirs
Uses libnativehelper_header_only library headers instead.

Needed as libnativehelper is part of the runtime module and so will not
be present in an unbundled build, instead its build targets will be
provided as prebuilts.

Bug: 134379140
Test: m checkbuild
Change-Id: I8becbda3a202ddaed52eaf861ac94fe4b08807c2
2019-07-16 16:08:12 +01:00
Paul Duffin
632d511a25 Merge "Convert preload2 from .mk to .bp"
am: 90453ff9d9

Change-Id: Id4efcf47ae705b827e65cbc0e33c4c455e6c81ed
2019-07-12 10:07:50 -07:00
Paul Duffin
c3613f452f Convert preload2 from .mk to .bp
Allows removal of dependency on apache-harmony-jdwp-tests-host.

Test: m preload2 preload-tool
Bug: 134379140
Change-Id: Idb75a7d4d4d27354511f9ff08194c2e738605f56
2019-07-11 13:57:47 +01:00
Kavi Gupta
c1a4da00c6 Merge "Add JVMTI agent to dump/reset JaCoCo coverage information" am: edf7470e0b
am: 7762c4aa6c

Change-Id: I717b3393095ae16b919aa77ace6104526ea8b17a
2019-06-28 16:16:52 -07:00
Treehugger Robot
edf7470e0b Merge "Add JVMTI agent to dump/reset JaCoCo coverage information" 2019-06-28 22:41:14 +00:00
Kavi Gupta
2d84ae7640 Add JVMTI agent to dump/reset JaCoCo coverage information
This agent can be attached to an arbitrary Android process with
arguments that cause it to either reset or dump the JaCoCo information
to a provided directory.

Test: manual, used examples in README to test whether it works on a
userdebug_coverage build on cuttlefish

Change-Id: If6cee20046f790676b8085e1ca84652c063295fa
2019-06-27 15:12:48 -07:00
Andreas Gampe
1e1d89d66c Merge "LockAgent: Refactor transformation code" am: e07c0cffe2
am: 14d72a73d9

Change-Id: I57d51ab8b0aac047006e03e18e0f681a6baa099d
2019-06-27 13:23:59 -07:00
Treehugger Robot
e07c0cffe2 Merge "LockAgent: Refactor transformation code" 2019-06-27 19:21:50 +00:00
Andreas Gampe
e4a6ca7231 Merge changes Ie70d0155,I0692a91d,I8c5041a4 am: 4507201da5
am: 70ad27cfb5

Change-Id: I7c11438bd295fd973f78302550e88833c84883b5
2019-06-21 13:52:40 -07:00
Andreas Gampe
f52b970c1c LockAgent: Add agent parameters to start_lock_agent script
Add parsing of "--agent-options" parameter to configure optional agent
features.

Sample: adb shell setprop wrap.system_server "start_with_lockagent --agent-options native_crash,java_crash"

Test: m
Test: manual
Change-Id: Ie70d0155096838782cb76f8111a42eba0c20e75d
2019-06-20 16:31:58 -07:00
Andreas Gampe
8695b40720 LockAgent: Add option to synthesize Java crash logging
Add the ability to dump a "crash" to logcat.

Test: m
Test: manual
Change-Id: I0692a91df995883e526a718fe95f0d3568ac9328
2019-06-20 16:31:58 -07:00
Andreas Gampe
5e2a8849c7 LockAgent: Add ability to generate a native crash
Use the crasher to create a tombstone with the violation as the abort
message.

Test: m
Test: manual
Change-Id: I8c5041a4fbffedb11b6b9c564ab1e214551896bf
2019-06-20 16:30:06 -07:00
Andreas Gampe
5b72cd1af6 Merge "LockAgent: Add crasher binary" am: a6874fccb6
am: 6c3f50dc6d

Change-Id: Ib65d7e5a6c02653eb9d815d4a0b1536d9fc6cbbe
2019-06-20 16:27:24 -07:00
Andreas Gampe
01e03da60a Merge "LockAgent: Refactor violation data" am: afb660cb49
am: bea5f08d86

Change-Id: Ib5a20d8b8aa81260883f4631a00390a819211d09
2019-06-20 14:09:37 -07:00
Andreas Gampe
3ffc019308 LockAgent: Add crasher binary
Add a helper that crashes with a given message.

Test: manual
Change-Id: I77e249484e65e7532045d0f8cc53ceb18d94bff5
2019-06-20 11:43:09 -07:00
Andreas Gampe
f9425d468b LockAgent: Refactor violation data
Start to make violation less opaque to improve more generic handling
in the future.

Test: m
Test: manual
Change-Id: Ic9780590301010798c7fe6df59526e609dc6f93a
2019-06-18 12:37:12 -07:00
Elliott Hughes
a65cae9e7f Move off ZipString and over to std::string/std::string_view as appropriate.
(Cherrypick to AOSP master, resolving merge conflicts.)

Bug: http://b/129068177
Test: treehugger
Change-Id: Ib46761d89772d3a3c655a39df573fd305c117d19
Merged-In: Ib46761d89772d3a3c655a39df573fd305c117d19
2019-06-17 16:05:19 -07:00
Elliott Hughes
78de4f999d Move off ZipString and over to std::string/std::string_view as appropriate.
Bug: http://b/129068177
Test: treehugger
Change-Id: Ib46761d89772d3a3c655a39df573fd305c117d19
2019-06-17 16:47:58 +00:00
Ryan Savitski
69b3390c9d Merge "userdebug: support perfetto traces as a section in incident reports" into qt-dev
am: cfff472c8e

Change-Id: I98dcfaf8b40f2715c881023d41234508e37db238
2019-06-13 16:50:58 -07:00
Ryan Savitski
cc7d9973c6 userdebug: support perfetto traces as a section in incident reports
This set of patches adds a way for the perfetto command line client to
save a trace to a hardcoded location,
/data/misc/perfetto-traces/incident-trace, and call into incidentd to
start a report, which will include said trace in a new section.

This is not a long-term solution, and is structured to minimize changes
to perfetto and incidentd. The latter is currently architected in a way
where it can only pull pre-defined information out of the system, so
we're resorting to persisting the intermediate results in a hardcoded
location.

This will introduce at most two more linked files at the same time.

Bug: 130543265
Tested: manually on crosshatch-userdebug
Merged-In: Iaaa312d2d9da73ca329807211227a8c7a049102c
Change-Id: Iaaa312d2d9da73ca329807211227a8c7a049102c
(cherry picked from commit 09a847902f)
2019-06-07 18:13:56 +01:00
Tej Singh
9c4a7fb13e Merge "Blacklist truncated atoms instead of whitelistnig" into qt-dev
am: 85a3a4689c

Change-Id: I6e36648f96564c8a8c49d85117cc54886fc0d894
2019-06-06 19:49:41 -07:00
Colin Cross
37d4c0054d Convert frameworks/base/cmds/* to Android.bp
See build/soong/README.md for more information.

Also converts the rest of frameworks/base/tools/streaming_proto.

Bug: 122332340
Test: m checkbuild
Change-Id: I87c500c5464fb1722b4b518d89065f5e1ee29a97
(cherry picked from commit 45c0d71e77)
2019-06-06 09:02:46 -07:00
Tej Singh
29ac601429 Blacklist truncated atoms instead of whitelistnig
We used a whitelist to determine which atoms should have their
timestamps truncated to the nearest 5 minutes. This changes the logic
to a blacklist so that we can get fine grained timestamps from vendor and
mainline atoms. Also reserves a range for atoms that need to be
truncated in the future.

Bug: 134574701
Test: inspected generated statslog.cpp file to make sure it had the
correct blacklist
Test: testdrive on ScreenStateChanged to ensure timestamps are preserved
when they should be
Test: testdrive on CallStateChanged to ensure timestamps are truncated
when they should be.

Change-Id: Id3468542c830cdf41395a94c77f7df0b46cd11b7
2019-06-05 18:10:12 -07:00
Joe Onorato
f4814d2df0 Add command line utilites to set the reason field in incident report header
am: 5dfe3dfeb8

Change-Id: If747fa28ec52d520048866dce46764951014e651
2019-05-22 02:24:50 -07:00
Joe Onorato
5dfe3dfeb8 Add command line utilites to set the reason field in incident report header
Bug: 132890298
Test: incident_report -t -r "\"Hello Joe\"" 3000
Change-Id: Ic7a2523d7e87ba88019c5ac9b23ff35387fbc498
2019-05-21 13:29:23 -07:00
Qingqing Deng
18de5974b0 Merge "Update fontchain_linter.py to support more flags." into qt-dev
am: ebc44f129e

Change-Id: I58d0fb20a40e27471e02b5d2c99fc5bb7298d428
2019-05-15 23:17:48 -07:00
Qingqing Deng
0b5f272162 Update fontchain_linter.py to support more flags.
Android Q will support all region flags in UNSUPPORTED_FLAGS list.
BL - Saint Barthélemy
BQ - Caribbean Netherlands
MQ - Martinique
RE - Réunion
TF - French Southern Territories

Bug: 127811703
Test: Verified on device.
Test: m fontchain_lint
Test: minikin_tests --gtest_filter=EmojiTest.cpp
Test: atest cts/tests/tests/text/src/android/text/cts/EmojiTest.java
Test: atest frameworks/base/core/tests/coretests/src/android/text/EmojiTest.java
Change-Id: Ice1fb10af35dc4e180735d9712167b71635920da
2019-05-15 17:17:34 -07:00
Ian Pedowitz
563abce4ed Merge "Revert "Revert "Android Q is API 29""" into qt-dev
am: a326dfb1e5

Change-Id: I0674668835cd5a281e8a01c4b5bdb870595a8305
2019-05-15 13:36:05 -07:00
Ian Pedowitz
a326dfb1e5 Merge "Revert "Revert "Android Q is API 29""" into qt-dev 2019-05-15 16:28:54 +00:00
Elliott Hughes
78e68ceb2b Merge "Don't explicitly specify no prefix/suffix." am: 480d18c472
am: d47c87a2e6

Change-Id: I7cc6d962ec602c844ad9e7f6179260e247b04dc8
2019-05-13 11:22:04 -07:00
Ian Pedowitz
1912a57900 Revert "Revert "Android Q is API 29""
This reverts commit 60c71cee6e.

Reason for revert: Rolling forward for Q-Finalization

Bug: 131429032
Bug: 129975435
Change-Id: Idd812d93b767d8a672b9ada58c8bcc2441395847
2019-05-12 19:44:42 +00:00
Elliott Hughes
65c8b86b3f Don't explicitly specify no prefix/suffix.
Bug: http://b/129068177
Test: treehugger
Change-Id: Ica29efa3c3e49f556157cb0f82fdadef91aadba8
2019-05-11 00:13:09 +00:00
Elliott Hughes
f31f126ed8 Don't explicitly specify no prefix/suffix.
Bug: http://b/129068177
Test: treehugger
Change-Id: I987c88c17b7d1fd01129545bdbd4178de446188c
2019-05-10 17:02:14 -07:00
Stephen Hines
38b1fecaad Merge "NFC: Fix implicit fallthrough warning." am: 30fc8829ed
am: 4c4ac1c2b1

Change-Id: I8d3a746434bd551aff34593897cd85c7b53ec25f
2019-05-09 16:23:35 -07:00