Commit Graph

54076 Commits

Author SHA1 Message Date
Tao Bao
98efd8290e Merge "releasetools: Move recovery-two-step.img to OTA/." 2019-07-28 17:57:06 +00:00
Tao Bao
0480850f0b releasetools: Move recovery-two-step.img to OTA/.
It used to be packed at IMAGES/recovery-two-step.img, but to serve OTA
purpose only.

Test: `m dist` with a non-A/B target. Check the file in the generated
      target_files.zip.
Test: Create two-step package. Check that recovery-two-step.img is used.
Change-Id: Iec6a73c682e0f844cd8c0b758c9470fa35dd15d8
2019-07-26 13:59:11 -07:00
Victor Chang
46d95f752b Add com.android.i18n APEX module to PRODUCT_PACKAGES
Bug: 137009149
Test: device boots
Change-Id: I9de4e6930456e52dec76dd2a67d6e7ddad393332
2019-07-26 18:37:22 +01:00
Jooyung Han
2fe7b62f07 Merge "fix: set built_module in misc_prebuilt_internal.mk"
am: 5da40edef0

Change-Id: I115082721abcc495e1f37d214b76b1e1e76876fc
2019-07-25 19:07:45 -07:00
Treehugger Robot
5da40edef0 Merge "fix: set built_module in misc_prebuilt_internal.mk" 2019-07-26 01:22:23 +00:00
Dan Willemsen
01ab167a20 Remove the APP-* goal
I can't find anything still using this, and I'm close to removing the
PRODUCT-* goal.

Test: codesearch (both android and the build configs)
Test: m APP-test
Change-Id: I4efdcdea2bb9ace14632cab35a2a1c7bdc89592f
2019-07-25 17:59:07 -07:00
Peter Collingbourne
e3606ae651 Specify the API level via the triple instead of __ANDROID_API__.
Clang derives the value of __ANDROID_API__ from the triple these days. In a
future version of clang I plan to start making the behaviour of the HWASAN pass
dependent on the API level in the triple, so it's going to need to be accurate.

Test: walleye-userdebug boots
Change-Id: I23f570bd8ee4fb3167729a75a5e859efe1883a46
2019-07-25 17:43:04 -07:00
Chris Gross
aad39b3281 Include extra licenses in vendor image NOTICE file
If building with a vendor image, ensure that the licenses from
extra partitions are included in the vendor NOTICE file (possibly in
addition to having them in the system NOTICE file) since they could come
from disperate source trees. This change does not affect existing NOTICE
files outside of the system partition. (e.g. product and system_ext).

Bug: 134679603
Test: Built a vendor image enabled target and ensured the notices were in the
proper file
Change-Id: Ib17c7d7f84805734de09e686a4835b9b680b4192
2019-07-25 16:10:05 -07:00
Tao Bao
706eb3c566 Merge "releasetools: Fix the use of StringIO."
am: 6b466c8f56

Change-Id: I5669a070c0d98239263557c005305002739d1c1d
2019-07-25 09:55:09 -07:00
Treehugger Robot
6b466c8f56 Merge "releasetools: Fix the use of StringIO." 2019-07-25 16:33:02 +00:00
Kiyoung Kim
ffe25d19b4 Merge "Add libraries txt file to build target"
am: cfbf9d32f6

Change-Id: Ieba83e4a38e500379ee2bc703db22a031b3cd198
2019-07-25 03:43:32 -07:00
Treehugger Robot
cfbf9d32f6 Merge "Add libraries txt file to build target" 2019-07-25 10:29:39 +00:00
Tao Bao
bb73388acf releasetools: Fix the use of StringIO.
Based on the actual semantics, it actually wants an in-memory _bytes_
buffer (io.BytesIO), especially when running with Python 3. This CL
fixes the issue and adds a unittest.

Bug: 131631303
Test: python -m unittest test_sign_target_files_apks
Test: python3 -m unittest test_sign_target_files_apks
Change-Id: I3fb067acc26713f1842e831225607779fd0d1b7e
2019-07-24 23:34:25 -07:00
Przemyslaw Szczepaniak
c1a7bec9ce Merge "Move libneuralnetworks.so to com.android.neuralnetworks APEX"
am: b4befed86f

Change-Id: I046adc9d59f21c8e3adc7bb426fc0034859b4a7d
2019-07-24 02:25:42 -07:00
Przemyslaw Szczepaniak
b4befed86f Merge "Move libneuralnetworks.so to com.android.neuralnetworks APEX" 2019-07-24 09:12:18 +00:00
Hsin-Yi Chen
8421d77549 Merge "Ensure no redundant ABI reference dumps"
am: 5358b924a3

Change-Id: I69955371ba2e6aa3ecbe73efdece3ebfd0845a27
2019-07-23 20:02:11 -07:00
Hsin-Yi Chen
5358b924a3 Merge "Ensure no redundant ABI reference dumps" 2019-07-24 02:27:18 +00:00
Tom Cherry
547f9e3726 [automerger skipped] Merge "Generate /etc/{passwd,group} for all partitions"
am: 6722de1277 -s ours
am skip reason: change_id Ia85abbeefe5a945369970f2aef42692e07ab8c09 with SHA1 6cf1b11ead is in history

Change-Id: I1c6a2507d03c6b030415611acc9f14808c9be002
2019-07-23 12:22:39 -07:00
Tom Cherry
6cf1b11ead Generate /etc/{passwd,group} for all partitions
Bug: 73062966
Test: can load AIDs from partitions other than vendor
Test: bionic-unit-tests
Merged-In: Ia85abbeefe5a945369970f2aef42692e07ab8c09
Change-Id: Ia85abbeefe5a945369970f2aef42692e07ab8c09
(cherry picked from commit 8a54ec8482)
2019-07-23 17:07:11 +00:00
Tom Cherry
6722de1277 Merge "Generate /etc/{passwd,group} for all partitions" 2019-07-23 16:40:01 +00:00
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
Kiyoung Kim
049d535910 Add libraries txt file to build target
Linkerconfig requires more libraries txt files to get library list
related variable values. To make this available from runtime, those
should be added as build target and included in system image.

Bug: 137511540
Test: m -j && tested from cuttlefish
Change-Id: I713c4419e4ed52e22561a5988f6c233ecce91c9d
2019-07-23 19:54:53 +09: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
Hsin-Yi Chen
07ece13f06 Ensure no redundant ABI reference dumps
This commit ensures that all ABI dumps under prebuilts/abi-dumps/ have
corresponding NDK/VNDK libraries. When an NDK/VNDK library is removed
but its ABI dump isn't, the build system reports an error.

The build system does not check whether all NDK/VNDK libraries have ABI
reference dumps because the owners of the libraries may intend to
disable ABI check in some cases.

Test: touch prebuilts/abi-dumps/vndk/R/32/x86/test.so.lsdump && make
Bug: 132140703
Change-Id: I615ac8b509f151b75f57f35cd78c518fae798974
2019-07-23 14:20:21 +08: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
Tom Cherry
fb303a5903 Generate /etc/{passwd,group} for all partitions
Bug: 73062966
Test: can load AIDs from partitions other than vendor
Test: bionic-unit-tests
Merged-In: Ia85abbeefe5a945369970f2aef42692e07ab8c09
Change-Id: Ia85abbeefe5a945369970f2aef42692e07ab8c09
2019-07-22 21:41:17 +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
Jooyung Han
0fbfb4bd57 fix: set built_module in misc_prebuilt_internal.mk
*_prebuilt_internal.mk should set "built_module" with LOCAL_BUILT_MODULE
on success, since it is used to set dependency between built module and
additional dependencies (LOCAL_ADDITIONAL_DEPENDENCIES).

In aosp/970424, it didn't set it properly.

As a consequence, setting additional dependencies to a built module was
wrong for various classes of modules(ETC, SCRIPT, DATA)

For example, prebuilt_etc_xml module(com.google.vr.platform.xml) has
an additional depdendency(timestamp of xmllint). But the dependency is
set to unexected module(com.android.support.apexer.soong_zip).
This is because that
1) built_module is not set in misc_prebuilt_internal.mk
2) built_module is not reset after use and soong_zip was last module
which set built_module variable.

Bug: 132925121
Test: m com.google.vr.platform.xml && check build-<TARGET>.ninja to see
if there is additional dependency as described above

Change-Id: I74fdf6b6ad583f3c08dc0b8fc8595d7ef9cc7306
2019-07-22 15:31:55 +09: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
Przemyslaw Szczepaniak
f67c72b34d Move libneuralnetworks.so to com.android.neuralnetworks APEX
Test: build&flashed crosshatch image
Bug: 137320025

Change-Id: Iadbb32cffc636c515a5e89b62539183ebc0c2f14
2019-07-19 16:41:48 +01: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