Commit Graph

53832 Commits

Author SHA1 Message Date
Steven Moreland a06f48c9ce Merge "Remove libhidlcache"
am: 21e8cbd570

Change-Id: I6635358ebe5637f28dde63d7b44034772516137e
2019-07-23 09:21:37 -07:00
Steven Moreland 4273f62e9b Merge "Add libbinder_ndk to ll-ndk."
am: 1f8089476a

Change-Id: I22651c7ba23ec46b10c6fe5e657b3a44283c7c60
2019-07-23 09:19:56 -07:00
Steven Moreland 21e8cbd570 Merge "Remove libhidlcache" 2019-07-23 15:51:17 +00:00
Steven Moreland 1f8089476a Merge "Add libbinder_ndk to ll-ndk." 2019-07-23 15:49:13 +00:00
Ramy Medhat 42c010d0e2 Merge "Add RBE mk file to support bootstrapping RBE and setting relevant environment variables."
am: f7eb2f829c

Change-Id: I10d9c206a80d13b67c547a5955235caae625c59f
2019-07-23 05:19:31 -07:00
Ramy Medhat f7eb2f829c Merge "Add RBE mk file to support bootstrapping RBE and setting relevant environment variables." 2019-07-23 11:49:10 +00:00
Pangyen Chen 98da247220 Merge "Inject boot patch level into boot-debug.img"
am: 5f42d56a24

Change-Id: I792e31ca36b287e2b597a1bbcf3205cbea51ce7a
2019-07-23 00:15:32 -07:00
Treehugger Robot 5f42d56a24 Merge "Inject boot patch level into boot-debug.img" 2019-07-23 06:40:58 +00:00
Steven Moreland ef85b4c4d4 Add libbinder_ndk to ll-ndk.
So that it is always in sync w/ system libbinder.

Bug: 136027762
Bug: 138152918
Test: binderVendorDoubleLoadTest
Change-Id: I46f896ee979d41ed67ac47b7c84652b4b49aa8c9
2019-07-23 01:28:32 +00:00
Tao Bao fe2a6389be Merge "Switch to aapt2 for getting minSdkVersion" into stage-aosp-master 2019-07-22 21:32:46 +00:00
Dan Albert cebd6d7387 Merge "Cleanup ASan build implementation."
am: bf07f0085b

Change-Id: I20d65d42430fa9f8d68bac4f8863a8758c95c0e5
2019-07-22 11:29:22 -07:00
Dan Albert bf07f0085b Merge "Cleanup ASan build implementation." 2019-07-22 18:05:10 +00:00
Steven Moreland 34f1c35a60 Remove libhidlcache
This is unused, and there are plans in the future
to use fwk IMemory everywhere.

Bug: 136027762
Test: N/A
Change-Id: I5f2eb40542d3127c08e4f74caa6adb3cd2bfbac1
2019-07-22 10:46:07 -07:00
Chris Gross 5c7ed33fc0 Merge "Create ODM partition NOTICE file"
am: 79da9010d5

Change-Id: If14ff4693db60f860332f51e179955010f3ca021
2019-07-22 10:05:15 -07:00
Chris Gross 79da9010d5 Merge "Create ODM partition NOTICE file" 2019-07-22 16:32:40 +00:00
Elliott Hughes 4ef2129851 Merge "Remove unused BoardConfig variables."
am: 56bcff99a4

Change-Id: I9f2406879a242deddc66bdaf4b4608b5be12ffc6
2019-07-22 09:20:43 -07:00
Elliott Hughes 56bcff99a4 Merge "Remove unused BoardConfig variables." 2019-07-22 15:41:21 +00:00
Pangyen Chen b994524ea6 Inject boot patch level into boot-debug.img
When /boot partition is AVB chained, boot patch level will be
included into the AVB metadata appended to boot.img. We should
also do the same for boot-debug.img to pass keymaster v4 VTS
tests, whichs checks per-partition security patch levels are
indicated in AVB properties.

Bug: 136980825
Test: avbtool info_image --image $OUT/boot-debug.img, checks
      com.android.build.boot.security_patch is there

Change-Id: I2ea1ebfa6abbbbc95639817c208a90642fc3d068
2019-07-22 18:04:03 +08:00
SzuWei Lin 735890c6c3 Merge "Add default LMK properties to GSI"
am: 97f75df31c

Change-Id: If0c223c87cc6cc353417af65a8304bee72792e2e
2019-07-19 16:30:57 -07:00
Treehugger Robot 97f75df31c Merge "Add default LMK properties to GSI" 2019-07-19 23:06:11 +00:00
changho.shin 0f12536e6b Switch to aapt2 for getting minSdkVersion
aapt does not support parsing some referencing attributes.
Switch to latest tool, aapt2, which works better.

Test: aapt2 dump badging test.apk and returned 0.
Test: Run check_target_files_signatures.py with a target_files.zip.
Test: Run sign_target_files_apks.py with a target_files.zip.
Change-Id: Ib3a4740506f29ebab6930767f2aa8a0b5c4ba053
2019-07-19 20:26:42 +00:00
Dan Albert a0530aa94d Cleanup ASan build implementation.
We already link the shared prebuilt from the toolchain. This is
redundant and the wrong version.

Test: make checkbuild
Bug: http://b/74067984
Change-Id: Ie315b7fd8195414717d3fbe6dad1f12577ef3e35
2019-07-19 12:53:00 -07:00
Tao Bao a8ef9264a3 Merge "Removed an obsolete TODO."
am: 7c9ea2b881

Change-Id: I82d3ffa022e7b62d2a244ecb07f5e91be8602962
2019-07-19 07:42:14 -07:00
Daniel Norman 36f8163589 Merge "Clean up merge_target_files.py."
am: ff165e31fd

Change-Id: I4bb6e084b0beb4a57df38a9e083b7e4900320a63
2019-07-19 07:41:27 -07:00
Tao Bao e8aa7dcf19 Merge "Build build_image and build_super_image as modules."
am: 25cf50f582

Change-Id: Idb34ce99b01fe432e0fe2f7824a87cc8fa3541bf
2019-07-19 07:40:39 -07:00
Martin Stjernholm 2920698dc3 Merge "Make the error messages from the two APEX_MODULE_LIBS checks easier to tell apart."
am: 02e116ce58

Change-Id: Id5ace581b036699cc2857fe1a47571d913a040f0
2019-07-19 07:39:54 -07:00
Elliott Hughes b5c68a02ae Merge "Remove perfprofd reference."
am: a627e9056b

Change-Id: I9f59616bb617d1c590eb6c923a5d8453ab4c2577
2019-07-19 07:38:56 -07:00
Isaac Chen 36cfb54915 Merge "Include tools/files for GSI artifacts"
am: 34e90798e5

Change-Id: I6b21d8fef3c90d0a066698bc176d3436c5a2931b
2019-07-19 07:20:44 -07:00
Tao Bao 7c9ea2b881 Merge "Removed an obsolete TODO." 2019-07-19 13:48:31 +00:00
Elliott Hughes 2e6e73bb01 Remove unused BoardConfig variables.
Determined via codesearch.

Test: treehugger
Change-Id: I5138e1b2294d39e11b46f9e1751c41b842c1743b
2019-07-18 21:43:38 -07:00
Daniel Norman ff165e31fd Merge "Clean up merge_target_files.py." 2019-07-19 03:15:29 +00:00
Tao Bao 301c6f471b Removed an obsolete TODO.
The intended check was to ensure system image won't be built as a
chained partition when using dynamic partitions. Because such an image
can't be verified by bootloader.

As it evolves, GSI system image has been built against the intended
check. Because GSI system image will be verified by first stage init in
userspace.

Bug: 80195851
Test: TreeHugger
Change-Id: I45b079799e5d7443e82d73d43e2b63c613f33165
2019-07-18 15:46:31 -07:00
Tao Bao 25cf50f582 Merge "Build build_image and build_super_image as modules." 2019-07-18 21:18:01 +00:00
Chris Gross 15d9655906 Create ODM partition NOTICE file
Logic to create a seperate ODM NOTICE file for modules located at
TARGET_OUT_ODM.

Bug: 137542307
Test: Built an image with both a seperate ODM image and one where it is
built into vendor.img and ensured that a NOTICE.xml.gz was located at
/odm/etc and contained any license generated by ODM modules.

Change-Id: I9e6f46b1b94c5b6584c2a5810713fcf49f637d02
2019-07-18 14:00:43 -07:00
Daniel Norman 4cc9df660b Clean up merge_target_files.py.
- Removes functions that can be replaced with one-line external methods
- Moves read_config_list to common alongside similar methods LoadDictionaryFrom*
- Runs pyformat on merge_target_files.py

Bug: 137853921
Test: python -m unittest test_merge_target_files
Test: Using merge_target_files.py to create a merged build, & booting.
Change-Id: I833c1086db41e1374057cc7447fc50d1915734a7
2019-07-18 13:04:54 -07:00
Treehugger Robot 02e116ce58 Merge "Make the error messages from the two APEX_MODULE_LIBS checks easier to tell apart." 2019-07-18 19:21:41 +00:00
Jeffrey Vander Stoep 887744f027 [automerger skipped] Merge "Renderscript: change extension .rs to .rscript"
am: 972695d81d -s ours
am skip reason: change_id Ibfccb4f52b74f9ac95c373f48d775254ba77288d with SHA1 c9de6f9de7 is in history

Change-Id: Ic24873ce9b0569b967cbfedc12911ef268eeda02
2019-07-18 12:11:19 -07:00
Tao Bao 2bbb07c53c Build build_image and build_super_image as modules.
Bug: 63866463
Test: TreeHugger
Test: `atest releasetools_test`
Test: `atest releasetools_py3_test`
Change-Id: I2059a4ced709d1b2ee331a9aaaa5ca30db4ebf6b
2019-07-18 10:27:38 -07:00
Treehugger Robot a627e9056b Merge "Remove perfprofd reference." 2019-07-18 17:22:43 +00:00
Isaac Chen 34e90798e5 Merge "Include tools/files for GSI artifacts" 2019-07-18 06:23:34 +00:00
Jeff Vander Stoep c9de6f9de7 Renderscript: change extension .rs to .rscript
Reserve .rs extension for Rust.

Bug: 137365032
Test: make checkbuild
Test: cd frameworks/compile/slang/tests
    ./slang_tests.py
Test: atest CtsRenderscriptTestCases
Test: CtsRsCppTestCases

Exempt-From-Owner-Approval: Clean CP
Change-Id: Ibfccb4f52b74f9ac95c373f48d775254ba77288d
Merged-In: Ibfccb4f52b74f9ac95c373f48d775254ba77288d
(cherry picked from commit 480864f1b0)
(cherry picked from commit f9b4f4b3e4)
2019-07-18 04:00:45 +00:00
Jeffrey Vander Stoep 972695d81d Merge "Renderscript: change extension .rs to .rscript" 2019-07-18 02:02:00 +00:00
Daniel Norman ac7ae9f6bb Merge "Writes misc_info.txt in o/t/p without requiring 'm dist'."
am: b74fa6cf97

Change-Id: I2ffc7bdd65b57e4b86e50c0a60ea08798c3d38ea
2019-07-17 19:01:09 -07:00
Daniel Norman b74fa6cf97 Merge "Writes misc_info.txt in o/t/p without requiring 'm dist'." 2019-07-18 01:00:09 +00:00
Daniel Norman e1e4808d57 Writes misc_info.txt in o/t/p without requiring 'm dist'.
Bug: 137291090
Test: `m misc_info`, diff with META/misc_info.txt from an old `m dist` build.
Change-Id: I9bb99d3418c91a64f7d585b4a4d6a17f540c7328
2019-07-17 14:13:27 -07:00
Jeff Vander Stoep c44aa3be41 Renderscript: change extension .rs to .rscript
Reserve .rs extension for Rust.

Bug: 137365032
Test: make checkbuild
Test: cd frameworks/compile/slang/tests
    ./slang_tests.py
Test: atest CtsRenderscriptTestCases
Test: CtsRsCppTestCases

Change-Id: Ibfccb4f52b74f9ac95c373f48d775254ba77288d
Merged-In: Ibfccb4f52b74f9ac95c373f48d775254ba77288d
2019-07-17 18:57:49 +00:00
Tao Bao b9c7ed6314 Merge "logging: set stdout and stderr to None in some cases"
am: e733ed7e6b

Change-Id: Ifa43d7a811b2c288de1a2ee3a10fee0efaa43661
2019-07-17 08:55:25 -07:00
Tao Bao e733ed7e6b Merge "logging: set stdout and stderr to None in some cases" 2019-07-17 15:40:59 +00:00
Elliott Hughes 36d86c1670 Remove perfprofd reference.
Dead and gone.

Test: treehugger
Change-Id: I8575fd9efaa371d61fac5204ee4d982e985a9a56
2019-07-17 08:16:29 -07:00
Ramy Medhat ec8b8dfa3e Add RBE mk file to support bootstrapping RBE and setting relevant
environment variables.

Test: Built aosp_arm-user with and without USE_RBE. With USE_RBE,
used a simple proxy script in place of rewrapper.

Change-Id: Ifb6bfd9f7292346f4750a6a409aa0def4e3c0363
2019-07-17 14:22:00 +00:00