Commit Graph

20724 Commits

Author SHA1 Message Date
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
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
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
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
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
Isaac Chen 36cfb54915 Merge "Include tools/files for GSI artifacts"
am: 34e90798e5

Change-Id: I6b21d8fef3c90d0a066698bc176d3436c5a2931b
2019-07-19 07:20:44 -07:00
Elliott Hughes 2e6e73bb01 Remove unused BoardConfig variables.
Determined via codesearch.

Test: treehugger
Change-Id: I5138e1b2294d39e11b46f9e1751c41b842c1743b
2019-07-18 21:43:38 -07: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
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
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
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
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
Isaac Chen 9e09d47df8 Include tools/files for GSI artifacts
Tools/files added in this CL are necessary for mixing GSI with vendor
images from other product and for the GSI to run on the emulator.

Bug: 136786169
Test: $ lunch aosp_x86-userdebug
      $ m -j updatepackage otatools-package emu_extra_imgs
      $ cd $TMP_DIR
      $ unzip $OUT/emu-extra-linux-system-images-eng.ycchen.zip
      $ cd x86
      $ unzip -n $OUT/aosp_x86-img-eng.ycchen.zip
      $ unzip $OUT/otatools bin/mk_combined_img bin/sgdisk
      $ unzip $OUT/otatools lib64/libc++.so lib64/libext2_uuid-host.so
      $ cut -d/ -f5 system-qemu-config.txt > composit.txt
      $ SGDISK=bin/sgdisk bin/mk_combined_img -i composit.txt -o system.img
      $ cd ..
      # Download sdk-repo-linux-emulator-*.zip from AB
      $ unzip -l sdk-repo-linux-emulator-*.zip
      $ ANDROID_PRODUCT_OUT=x86 ANDROID_BUILD_TOP=x86 emulator/emulator

Change-Id: Ibf88652eb4fb3244553062bbfb8bceac9a5cda47
2019-07-17 18:06:31 +08:00
Colin Cross 9966be5752 Merge "Don't escape BuildNumberFromFile"
am: cea6dcd135

Change-Id: I34ea7aa3efe6394118662ea7b678bb9eb23ed703
2019-07-16 19:59:17 -07:00
Colin Cross cea6dcd135 Merge "Don't escape BuildNumberFromFile" 2019-07-17 02:45:02 +00:00
Colin Cross 91b78978fd Don't escape BuildNumberFromFile
Change BuildNumberFromFile to be unescaped.  This will allow passing
ctx.Config().BuildNumberFromFile() to RuleBuilder, which will handle
the necessary escaping.

Test: no change to out/soong/build.ninja
Change-Id: Iab8df0ecf08d7078093c89a994382eab394117a5
2019-07-16 10:21:41 -07:00
Martin Stjernholm 1886f53103 Make the error messages from the two APEX_MODULE_LIBS checks easier to tell
apart.

Also make it more clear what the problem may be when the "find" check fails,
to aid troubleshooting.

Test: m
Change-Id: Iacdc4734f20eeaf3fb0d29e418df21f5089cecbc
2019-07-16 17:47:33 +01:00
Dimitry Ivanov fee4ab3b29 Merge "Add NativeBridgeRelativePath config variables"
am: 9c7ab5944e

Change-Id: I452b48d38285137022c004d481b0d596dd8b2533
2019-07-16 02:43:36 -07:00
Dimitry Ivanov 9c7ab5944e Merge "Add NativeBridgeRelativePath config variables" 2019-07-16 09:17:35 +00:00
Tianjie Xu 09f64c0cd5 Merge "Add update_host_simulator to otatools"
am: f70815cbd2

Change-Id: I48acd7a3754a771aebbd94252f41448c983684b2
2019-07-15 11:32:36 -07:00
Tianjie Xu f70815cbd2 Merge "Add update_host_simulator to otatools" 2019-07-15 18:00:16 +00:00
Logan Chien 014de67d06 Merge changes Ia0410da8,Id756340f
am: 1277b8cca1

Change-Id: Ideb6440a6e0b1738c08beb021eace76c907ab685
2019-07-13 14:04:53 -07:00
Logan Chien 1277b8cca1 Merge changes Ia0410da8,Id756340f
* changes:
  Strip my_shared_libraries to remove space char
  Move cxx_stl_setup.mk out of ifdef
2019-07-13 20:56:04 +00:00
Steve Muckle b81725dff1 Merge "install modules.softdep from depmod output"
am: 10115f54b9

Change-Id: I3b8ac4d326b09da334eb29bcf5b7ff197247bbd9
2019-07-12 16:02:48 -07:00
Treehugger Robot 10115f54b9 Merge "install modules.softdep from depmod output" 2019-07-12 22:20:22 +00:00
Daniel Norman 0d1b2ddaad Merge "Changes host_init_verifier to use hidl interface inheritance hierarchy."
am: 858fa08427

Change-Id: I4257caefab23a66d34f3160e922bff5e140e002d
2019-07-12 11:32:38 -07:00
Daniel Norman 858fa08427 Merge "Changes host_init_verifier to use hidl interface inheritance hierarchy." 2019-07-12 18:01:46 +00:00
Logan Chien e984ebbb57 Strip my_shared_libraries to remove space char
This commit strips my_shared_libraries to remove the unwanted space
character when both `$(filter-out ...)` and
`$(my_system_shared_libraries)` are empty.

Bug: 137302468
Test: lunch aosp_walleye-userdebug && make
Test: lunch aosp_walleye-userdebug && make check-elf-files
Change-Id: Ia0410da877196c104a61d48c92a2be969a9754a5
2019-07-12 10:26:50 -07:00
Logan Chien a45d6f5ee9 Move cxx_stl_setup.mk out of ifdef
This commit moves `include cxx_stl_setup.mk` out of `ifdef
my_shared_libraries` so that it can always get a chance to tweak
my_shared_libraries.

Bug: 137302468
Test: lunch aosp_walleye-userdebug && make
Test: lunch aosp_walleye-userdebug && make check-elf-files
Change-Id: Id756340f0a62d7ac06d301c3260430a1af74ed89
2019-07-12 10:26:50 -07:00
Elliott Hughes 7a45e0ccb9 Merge "Stop building unnecessary tarballs."
am: 9a4b84de56

Change-Id: I9465ce123bc1d5ab9662069af6181dd7382eff57
2019-07-12 08:10:05 -07:00