Commit Graph

53972 Commits

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

Change-Id: I2001d6b2b86a0affb6a8b03ef16bca779a017d13
2019-07-19 07:26:42 -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
Jeffrey Vander Stoep 89e4a57440 [automerger skipped] Merge "Renderscript: change extension .rs to .rscript" am: 972695d81d -s ours
am: 887744f027 -s ours
am skip reason: change_id Ibfccb4f52b74f9ac95c373f48d775254ba77288d with SHA1 c9de6f9de7 is in history

Change-Id: I5fe20309ecca34a2733b4123ce05717451a890a6
2019-07-18 12:28:12 -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 f2b6855077 [automerger skipped] Renderscript: change extension .rs to .rscript
am: c9de6f9de7 -s ours
am skip reason: change_id Ibfccb4f52b74f9ac95c373f48d775254ba77288d with SHA1 f9b4f4b3e4 is in history

Change-Id: I01a32dddafefb7b6e0ec65e41638efeec9f4e0ef
2019-07-17 22:42:16 -07: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
Daniel Norman 7ffdad6408 Merge "Writes misc_info.txt in o/t/p without requiring 'm dist'." am: b74fa6cf97
am: ac7ae9f6bb

Change-Id: Ife4bfdb0f35cddd732ba6ceec8e8d33597d2f94f
2019-07-17 19:21:48 -07: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
Jeff Vander Stoep f9b4f4b3e4 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)
2019-07-17 21:47:34 +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 0c7f1f6abd Merge "logging: set stdout and stderr to None in some cases" am: e733ed7e6b
am: b9c7ed6314

Change-Id: I8baa8e8f8a202acc12ca7ee758bb684a23aefcaf
2019-07-17 09:11:33 -07: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
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
Isaac Chen 5f07bf4723 [automerger skipped] Merge "Disable apex update for GSI" into qt-dev
am: 66893b698c -s ours
am skip reason: change_id I08fd7a1b254aac276926329e064c35b714764936 with SHA1 fae280264e is in history

Change-Id: I2677d2e2a6730a62db4f18972f2bbfbf1d1d991a
2019-07-16 20:46:13 -07:00
TreeHugger Robot 66893b698c Merge "Disable apex update for GSI" into qt-dev 2019-07-17 03:23:16 +00:00
Colin Cross a119cba74b Merge "Don't escape BuildNumberFromFile" am: cea6dcd135
am: 9966be5752

Change-Id: Ifffc6ac7c6d0f4046e4c20148d8407d0c658dcab
2019-07-16 20:09:06 -07: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
Tianjie Xu f012aaeb8b Merge "Factor out the image classes to break circular dependency" am: dcb6644719
am: bcc3554b74

Change-Id: Ib7a51d8e68fc9a38febc776454929170c59733bb
2019-07-16 13:42:23 -07:00
Ryan Prichard ab0ed6e53a Merge "envsetup: avoid adding "::" (the cwd) to the PATH" am: 0f998368bb
am: 9347391dca

Change-Id: Id3a407a83278fdcab878f8cb4d777a78e3bdcc76
2019-07-16 13:30:29 -07:00
Tianjie Xu bcc3554b74 Merge "Factor out the image classes to break circular dependency"
am: dcb6644719

Change-Id: I16371818e6e022ee75187b9c9e104836a72dd983
2019-07-16 13:30:24 -07:00
Ryan Prichard 9347391dca Merge "envsetup: avoid adding "::" (the cwd) to the PATH"
am: 0f998368bb

Change-Id: Iea4402ef6c64c5764e8df5fe95b26568679cf0be
2019-07-16 13:20:22 -07:00
Tianjie Xu dcb6644719 Merge "Factor out the image classes to break circular dependency" 2019-07-16 20:09:50 +00:00
Ryan Prichard 0f998368bb Merge "envsetup: avoid adding "::" (the cwd) to the PATH" 2019-07-16 20:04:15 +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 07ac09b504 Merge "Add NativeBridgeRelativePath config variables" am: 9c7ab5944e
am: fee4ab3b29

Change-Id: I8da654cc9677e475ea9af9094d63ad133c593fc4
2019-07-16 02:49:36 -07:00
Dimitry Ivanov fee4ab3b29 Merge "Add NativeBridgeRelativePath config variables"
am: 9c7ab5944e

Change-Id: I452b48d38285137022c004d481b0d596dd8b2533
2019-07-16 02:43:36 -07:00