Commit Graph

53972 Commits

Author SHA1 Message Date
Justin Yun 0a81687a25 Add product and system_ext partition for emulator
am: ff3d62d31d

Change-Id: I9671c9532199ad6c4022b31c5a6027bbfce68b06
2019-07-30 17:49:22 -07:00
Justin Yun ff3d62d31d Add product and system_ext partition for emulator
Build product and system_ext image and add them to super partition.

Bug: 138382074
Test: boot emulator and check system_ext partition mounted
Change-Id: Ifa67bd6ad475ac5912e8f919c7a771c9958bd5c2
Merged-In: Ifa67bd6ad475ac5912e8f919c7a771c9958bd5c2
(cherry picked from commit 28843c3e32)
2019-07-31 00:13:19 +00:00
Dan Willemsen b83dfe2452 Merge "Stop supporting wrapping the build with `make`" am: d69e849c9b
am: 93b7c1b547

Change-Id: Iabd504df24329930246322076a724bedf6af625e
2019-07-30 15:58:32 -07:00
Dan Willemsen 93b7c1b547 Merge "Stop supporting wrapping the build with `make`"
am: d69e849c9b

Change-Id: If6e369f82348d9d7aebe37104072a6878f7281ea
2019-07-30 15:44:36 -07:00
Dan Willemsen d69e849c9b Merge "Stop supporting wrapping the build with `make`" 2019-07-30 21:48:52 +00:00
Chris Gross 0717394346 Merge "Include extra licenses in vendor image NOTICE file" am: bb039794d6
am: 4cff1f80f2

Change-Id: Ifc1b076373a59eb45e85bac935c0c9938c7593d0
2019-07-30 12:47:20 -07:00
Chris Gross 4cff1f80f2 Merge "Include extra licenses in vendor image NOTICE file"
am: bb039794d6

Change-Id: I1260e92b1cefae5a1c22ae936498157d3b7141d0
2019-07-30 12:34:02 -07:00
Chris Gross bb039794d6 Merge "Include extra licenses in vendor image NOTICE file" 2019-07-30 19:01:02 +00:00
Dan Willemsen 415fcd6e0c Merge "Remove the PRODUCT-* goal" am: a2d19cfd05
am: f02f1f16f0

Change-Id: Ia5639f6e0aed83c0af8854702e10954871a4cecd
2019-07-30 10:43:35 -07:00
Dan Willemsen f02f1f16f0 Merge "Remove the PRODUCT-* goal"
am: a2d19cfd05

Change-Id: I8c83c177104117a88fa9822c48ec7fe45b69365c
2019-07-30 10:34:33 -07:00
Dan Willemsen a2d19cfd05 Merge "Remove the PRODUCT-* goal" 2019-07-30 17:04:07 +00:00
Baligh Uddin ea053b4dd3 Select all .pem and .avbpubkey in otatools
am: df238b4e41

Change-Id: I6ad30769640ed9fe7d9c9e6828b62b2108833193
2019-07-30 07:08:43 -07:00
Evgeny Eltsin 72e728e45a Merge "Add native bridge abis to corresponding abilists" am: 2cd7eaaf13
am: 03290e1b45

Change-Id: Ib889a05f1c099cb636465112a92e791615ed44d2
2019-07-30 05:23:36 -07:00
Evgeny Eltsin 03290e1b45 Merge "Add native bridge abis to corresponding abilists"
am: 2cd7eaaf13

Change-Id: I4835048b7f912eb4cbf7dc4da2a100805afb1b4b
2019-07-30 05:12:30 -07:00
Evgeny Eltsin 2cd7eaaf13 Merge "Add native bridge abis to corresponding abilists" 2019-07-30 11:36:27 +00:00
Dan Willemsen 893948955d Stop supporting wrapping the build with `make`
The build servers are no longer using this. It's hard to search for
others using it -- I've cleaned them up as I've run across them, but
we'll just have to see who breaks once this goes in.

This was the last user of makeparallel, so we can remove it.

Test: make
Test: treehugger
Change-Id: If6df3f1a67d6a6df36afaa4b07cd88a48a364fe1
2019-07-29 22:43:35 -07:00
Baligh Uddin df238b4e41 Select all .pem and .avbpubkey in otatools
Apex payload dev keys are stored as .pem files.
Apex payload also utilizes .avbpubkey as public keys.

Change-Id: I65ced74be02008b666d7bb608f0d0a3ef3769c9c
BUG: 138623265
2019-07-29 21:35:05 -07:00
Peter Collingbourne 8999e10226 Merge "Specify the API level via the triple instead of __ANDROID_API__." am: 58df13daa0
am: 3d7a9461e9

Change-Id: Ib3a2099ca0cf9538469969641615f57946213d29
2019-07-29 18:49:26 -07:00
Peter Collingbourne 3d7a9461e9 Merge "Specify the API level via the triple instead of __ANDROID_API__."
am: 58df13daa0

Change-Id: I5a4388b3b91b1adaef771a4ef608ec708e1adad4
2019-07-29 18:39:23 -07:00
Peter Collingbourne 58df13daa0 Merge "Specify the API level via the triple instead of __ANDROID_API__." 2019-07-30 01:23:04 +00:00
Daniel Norman 0cb5dfb3dd Merge "Adds new merge builds script for use in merging two non-dist builds." am: a85f0ee8a2
am: 3f9554b59a

Change-Id: I4a693e2122b1ddefd1b4166d6218055d5636e49d
2019-07-29 17:50:44 -07:00
Daniel Norman 3f9554b59a Merge "Adds new merge builds script for use in merging two non-dist builds."
am: a85f0ee8a2

Change-Id: Ib7b66d5ee82df1d9f31d521917490ac1bac4a4e2
2019-07-29 17:36:57 -07:00
Treehugger Robot a85f0ee8a2 Merge "Adds new merge builds script for use in merging two non-dist builds." 2019-07-29 23:45:41 +00:00
Dan Willemsen 8a5d597bbf Remove the PRODUCT-* goal
I've switched all the build server configs to using TARGET_PRODUCT /
TARGET_BUILD_VARIANT and explicit goals instead.

Remove tools/check_builds.sh which relied on this, but hasn't been
touched in a long time.

Test: m PRODUCT-test
Test: treehugger
Change-Id: If5f8c714567b33aeb38223c176ca24ea649eb57d
2019-07-29 14:27:04 -07:00
Dan Willemsen 4b8a9d9475 Merge "Remove the APP-* goal" am: 6f8e3da035
am: 7d5afb53d5

Change-Id: If980fe2d1c4173194854558e05982a065c81204d
2019-07-29 13:34:31 -07:00
Dan Willemsen 7d5afb53d5 Merge "Remove the APP-* goal"
am: 6f8e3da035

Change-Id: I7fc95016a6c12e7341f4680bbfb67d6ddaaec4ee
2019-07-29 13:18:38 -07:00
Daniel Norman bfc51efa97 Adds new merge builds script for use in merging two non-dist builds.
Bug: 137853921
Test: python -m unittest test_common
Test: python -m unittest test_merge_target_files
Test: Built two partial builds without dist. Ran out/host/linux-x86/bin/merge_builds.
Flashed using `fastboot flashall`. Device boots.
Change-Id: Iffd0a447cdf19a7775a813b4b896178aa6f861f3
2019-07-29 16:30:56 +00:00
Treehugger Robot 6f8e3da035 Merge "Remove the APP-* goal" 2019-07-29 16:30:52 +00:00
Evgeny Eltsin 28fbe7f9e9 Add native bridge abis to corresponding abilists
This uses TARGET_NATIVE_BRIDGE_*_ABI variable to automatically generate
abi lists.

Sample properties for x86+arm:
ro.product.cpu.abilist=x86,armeabi-v7a,armeabi
ro.product.cpu.abilist32=x86,armeabi-v7a,armeabi
ro.product.cpu.abilist64=

Sample properties for x86_64+arm64:
ro.product.cpu.abilist=x86_64,x86,arm64-v8a,armeabi-v7a,armeabi
ro.product.cpu.abilist32=x86,armeabi-v7a,armeabi
ro.product.cpu.abilist64=x86_64,arm64-v8a

Bug: http://b/77159578
Bug: http://b/28684022
Test: make cf_x86_64_phone, deploys, check adb shell getprop | grep abi
Change-Id: I42a73f5c627b9d9f44e31cc5ad84238e1050f52a
2019-07-29 16:23:32 +02:00
Tao Bao 86c58acb90 Merge "releasetools: Move recovery-two-step.img to OTA/." am: 98efd8290e
am: ac280723c2

Change-Id: If2572412f7f01d15c9ce4938791c1537ab7fdf26
2019-07-28 11:13:05 -07:00
Tao Bao ac280723c2 Merge "releasetools: Move recovery-two-step.img to OTA/."
am: 98efd8290e

Change-Id: I21419dc4a13271c589b8bcb4a4be7da02ef1587d
2019-07-28 11:07:07 -07:00
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
Jooyung Han c961d7badc Merge "fix: set built_module in misc_prebuilt_internal.mk" am: 5da40edef0
am: 2fe7b62f07

Change-Id: I4602eea395631044ff67ba2e879b5c77d73597db
2019-07-25 19:19:39 -07: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 cc5d077015 Merge "releasetools: Fix the use of StringIO." am: 6b466c8f56
am: 706eb3c566

Change-Id: Ie4a2bdc018d5e2e3ff26b5a4ac55cd9d8a9314cb
2019-07-25 10:07:09 -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 ffe6e53d8e Merge "Add libraries txt file to build target" am: cfbf9d32f6
am: ffe25d19b4

Change-Id: I729df9ad78f8c45c3b4ba4d7bad0600e69b24ac2
2019-07-25 03:53:14 -07: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 3d0e4d5c03 Merge "Move libneuralnetworks.so to com.android.neuralnetworks APEX" am: b4befed86f
am: c1a7bec9ce

Change-Id: I675391ec29b3d12dff368cd70a8b4f76db1a9495
2019-07-24 02:35: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 2c3a750b7e Merge "Ensure no redundant ABI reference dumps" am: 5358b924a3
am: 8421d77549

Change-Id: I776119eaf3cd59c5a3e18605dd87757ffc24e480
2019-07-23 20:10:23 -07:00