Commit Graph

52758 Commits

Author SHA1 Message Date
Bill Rassieur 43d98dc805 Master is now designated for R. Update MAX_PLATFORM_VERSION, etc.
Bug: 128934651
Test: treehugger
Change-Id: I352e02484fa73ee924c84846913b93f7713c77ef
Merged-In: I352e02484fa73ee924c84846913b93f7713c77ef
2019-04-17 18:09:53 -07:00
Tom Cherry 619ece0bad Merge "Remove TARGET_ROOT_OUT_SBIN / TARGET_ROOT_OUT_SBIN_UNSTRIPPED" am: c9bb097bee
am: 7c65e30e0e

Change-Id: I508adda7ba0c4117d81e3bb9b508c0c029c480ad
2019-04-17 17:07:54 -07:00
Dan Willemsen 695849ec88 Add infrastructure for deprecating module types
Also start the deprecation for BUILD_HOST_TEST_CONFIG and
BUILD_TARGET_TEST_CONFIG, which have no users.

Bug: 130720555
Bug: 130723115
Bug: 130734993
Test: treehugger
Test: Add entries to DEFAULT_ERROR / OBSOLETE to manually test behavior
Change-Id: Icfdff43a29b6512494d44b9be11d178333505010
2019-04-17 17:02:20 -07:00
Colin Cross e6210f6eb2 Remove AAPT1 support
AAPT2 is used everywhere now, remove support for AAPT1.  Also
removes dpi_specific_apk.mk, it was never updated to use AAPT2
and has been generating bad APKs (resource ID mismatch between
the dex files and the resources) since AAPT2 was made the default
in May 2018 (I9b67fd2a9b3234798b2aac879b5242c2097b3863).

Bug: 80450981
Test: m checkbuild
Change-Id: I2ff768897360ff866dbae5562455bab22be270f7
Merged-In: I2ff768897360ff866dbae5562455bab22be270f7
2019-04-17 16:50:30 -07:00
Tom Cherry 7c65e30e0e Merge "Remove TARGET_ROOT_OUT_SBIN / TARGET_ROOT_OUT_SBIN_UNSTRIPPED"
am: c9bb097bee

Change-Id: Ibe6e92407258c662065097c4650c3df69ce9227f
2019-04-17 16:50:14 -07:00
TreeHugger Robot 92f162f2d4 Merge "Remove AAPT1 support" into qt-dev-plus-aosp 2019-04-17 23:42:16 +00:00
Tom Cherry c9bb097bee Merge "Remove TARGET_ROOT_OUT_SBIN / TARGET_ROOT_OUT_SBIN_UNSTRIPPED" 2019-04-17 23:26:13 +00:00
Daniel Norman 8fb00a71aa Merge changes from topic "merge_target_files_new_flags" am: 324d553c7c
am: b6a15bca81

Change-Id: Ia25149af2e4333a1c7f502aa1abfa25cde3422eb
2019-04-17 16:14:33 -07:00
Daniel Norman b6a15bca81 Merge changes from topic "merge_target_files_new_flags"
am: 324d553c7c

Change-Id: I13966ab6a8a263684385eed483712ba2cd61a539
2019-04-17 15:07:52 -07:00
Daniel Norman e5b134aa02 Runs python formatter and linter over merge_target_files.
Test: python -m unittest test_merge_target_files
Change-Id: I95c8611439a019cd21ba16a93327f35e2035a84d
2019-04-17 14:54:06 -07:00
Colin Cross dc40fe6c6c [automerger skipped] Merge "Always use aapt2 for prebuilt appcompat" into qt-dev
am: 54768ddf3a -s ours
am skip reason: change_id If32c03410fbdb3945bf20f7405de13dc8cd83038 with SHA1 a0d89b994f is in history

Change-Id: Ie814b21e49a78ef6444e70a0b89155247d42c546
2019-04-17 14:15:54 -07:00
Daniel Norman 324d553c7c Merge changes from topic "merge_target_files_new_flags"
* changes:
  Adds --output-ota flag to enable building the OTA package.
  Adds --output-super-empty flag to enable building super_empty.img.
  Adds output-dir and output-item-list for copying only certain files.
2019-04-17 21:14:35 +00:00
TreeHugger Robot 54768ddf3a Merge "Always use aapt2 for prebuilt appcompat" into qt-dev 2019-04-17 20:14:40 +00:00
Android Build Merger (Role) 1137d77a85 Merge "Temporarily not inheriting updatable_apex.mk am: c5fc637c20" into qt-dev-plus-aosp 2019-04-17 20:09:15 +00:00
Jiyong Park 182b704fc8 Temporarily not inheriting updatable_apex.mk
am: c5fc637c20

Change-Id: I7792f4edf564919493816c90528f079f0af64d36
2019-04-17 13:08:10 -07:00
Martin Stjernholm 25558bb428 Merge "Exclude lib/arm(64) from the library absence check." am: 843f666adf
am: b68cac93ef

Change-Id: I7e1734fbe2086b9e26b3f31505c3b6eb78830800
2019-04-17 13:07:46 -07:00
Colin Cross 0a40c727ed Remove AAPT1 support
AAPT2 is used everywhere now, remove support for AAPT1.  Also
removes dpi_specific_apk.mk, it was never updated to use AAPT2
and has been generating bad APKs (resource ID mismatch between
the dex files and the resources) since AAPT2 was made the default
in May 2018 (I9b67fd2a9b3234798b2aac879b5242c2097b3863).

Bug: 80450981
Test: m checkbuild
Change-Id: I2ff768897360ff866dbae5562455bab22be270f7
2019-04-17 12:53:08 -07:00
Dan Willemsen bed1918841 Mark BUILD_* as readonly
Test: treehugger (build_test)
Change-Id: I2fddd43ebeaffd48246ab2fa289a19131094a1ac
2019-04-17 12:35:41 -07:00
Martin Stjernholm b68cac93ef Merge "Exclude lib/arm(64) from the library absence check."
am: 843f666adf

Change-Id: Ib36976ed7957bd0fe5e501939fc8185cfa1d1186
2019-04-17 12:35:05 -07:00
Treehugger Robot 843f666adf Merge "Exclude lib/arm(64) from the library absence check." 2019-04-17 18:16:35 +00:00
Tom Cherry 6b28af30fb Remove TARGET_ROOT_OUT_SBIN / TARGET_ROOT_OUT_SBIN_UNSTRIPPED
/sbin was traditionally used for static binaries on the ramdisk for
Android, but now everything is a shared binary, so this directory is
empty and we do not want to encourage creation of new libraries in
this directory.

Bug: 73660730
Test: build
Change-Id: Ia82d892adfffb6fa325d0c570ae7999e7bb28dc2
2019-04-17 11:12:32 -07:00
Bill Peckham 095186f2dd Merge "Optimize build for PRODUCT_BUILD_SYSTEM_IMAGE := false case." am: 953ec4cd70
am: 1702d2a721

Change-Id: I8282db4640d339bf82ca882a0bd270b64d1589e5
2019-04-17 10:29:27 -07:00
Daniel Norman 3b64ce1437 Adds --output-ota flag to enable building the OTA package.
This simplifies the use case for mixed build users. Instead of having to
remember to call ota_from_target_files.py after this script, they can
use this flag to automatically create the OTA package.

Bug: 129976345
Test: Ran merge_target_files.py using --output-ota and inspected the
resulting zip.

Change-Id: Icc95943c24b8f83b3221e845a7d69a34c1edb4fc
2019-04-17 10:28:57 -07:00
Bill Peckham 1702d2a721 Merge "Optimize build for PRODUCT_BUILD_SYSTEM_IMAGE := false case."
am: 953ec4cd70

Change-Id: Ic404faa6a2deac5fd7c1fb5a37ab1008a9cd7daf
2019-04-17 10:24:13 -07:00
Daniel Norman f031825560 Adds --output-super-empty flag to enable building super_empty.img.
Any mixed build that uses dynamic partitions will require a
super_empty.img image. This image must be created from the merged
misc_info.txt file, so adding this functionality here simplifies
the creation of this image for users (versus having to call
build_super_image.py manually after calling merge_target_files.py).

Bug: 129976345
Test: Ran merge_target_files.py on a dynamic partition enabled build
using the new --output-super-empty flag.

Change-Id: I73901f363d73c9fae1af1579faa2a908369dbbec
2019-04-17 10:22:11 -07:00
Daniel Norman fdb38817ea Adds output-dir and output-item-list for copying only certain files.
This provides the ability to run merge_target_files without the end goal
of a target files zip. This is useful for users that only want the IMAGES
folder, for example.

Bug: 130304869
Test: python -m unittest test_merge_target_files
Change-Id: If0412b8e1eb85fe09d7b689fd7f56ce84067faea
2019-04-17 10:17:50 -07:00
Bill Peckham 953ec4cd70 Merge "Optimize build for PRODUCT_BUILD_SYSTEM_IMAGE := false case." 2019-04-17 17:11:10 +00:00
Jiyong Park c5fc637c20 Temporarily not inheriting updatable_apex.mk
It broke camera.

Bug: 130652892
Test: m
Test: adb shell getprop ro.apex.updatable should return false or nothing
Change-Id: Id2df926e152411cb5d0bc4331cfd43e0dcd8ad6c
2019-04-17 16:21:36 +00:00
Jiyong Park 5645a3a9a0 Add updatable_apex.mk
The product abstracts configs that need to be set to support updating of
APEXes.

Bug: 130418467
Test: m
Test: adb shell getprop ro.apex.updatable in Pixel 2 and 3
Test: adb shell /system/apex/com.android.apex.cts.shim.apex exists.
Merged-In: Idb44388a0cf6338f8b4500a1d0d2762ed59476bf
Change-Id: Idb44388a0cf6338f8b4500a1d0d2762ed59476bf
(cherry picked from commit fa51bedf8b)
2019-04-17 16:18:56 +09:00
Colin Cross 081e9b5363 Always use aapt2 for prebuilt appcompat
Running appcompat is missing a dependency on aapt/aapt2.  There
is no need to switch between aapt and aapt2, so always use aapt2
and add the missing dependency.

Fixes: 130575935
Test: treehugger
Change-Id: If32c03410fbdb3945bf20f7405de13dc8cd83038
Merged-In: If32c03410fbdb3945bf20f7405de13dc8cd83038
(cherry picked from commit a0d89b994f)
2019-04-16 23:00:52 -07:00
Colin Cross 286d5e8741 Merge "Always use aapt2 for prebuilt appcompat" am: bbfcef3fb7
am: 4717478ad9

Change-Id: Id9e64660d6d874c0ebd69bc5a82d49d4f46597a6
2019-04-16 19:23:13 -07:00
Colin Cross 4717478ad9 Merge "Always use aapt2 for prebuilt appcompat"
am: bbfcef3fb7

Change-Id: I5e59d1fa84f87bb4fb39b4c54106f61e415ac4c4
2019-04-16 18:53:49 -07:00
Treehugger Robot bbfcef3fb7 Merge "Always use aapt2 for prebuilt appcompat" 2019-04-17 01:20:13 +00:00
Colin Cross 56ce968ae0 [automerger skipped] Merge "Add default proguard flags from guava" am: 727ef10366
am: 15e4096803 -s ours
am skip reason: change_id Ia9948d597538a16c5b7ab26a2e41eebde52e7427 with SHA1 b4917146aa is in history

Change-Id: I0c2dd9f1cd8e47b9411dc2e92e3d9c6f112ab083
2019-04-16 17:11:06 -07:00
Bill Peckham d52fd9b016 Optimize build for PRODUCT_BUILD_SYSTEM_IMAGE := false case.
When PRODUCT_BUILD_SYSTEM_IMAGE is false, avoid building artifacts and
intermediates that will not be used. This speeds up the build for these cases.

Bug: 123427297
Test: No change when building system image, smaller build when not
Change-Id: I438e4794af5376c897ffcc1d795a1e114dccd351
2019-04-16 16:42:26 -07:00
Colin Cross 15e4096803 Merge "Add default proguard flags from guava"
am: 727ef10366

Change-Id: Ic2ad2ce8bae1ee5cc5cbff89e523d18e1a9ffb9f
2019-04-16 16:28:22 -07:00
Colin Cross 727ef10366 Merge "Add default proguard flags from guava" 2019-04-16 23:14:12 +00:00
Colin Cross a0d89b994f Always use aapt2 for prebuilt appcompat
Running appcompat is missing a dependency on aapt/aapt2.  There
is no need to switch between aapt and aapt2, so always use aapt2
and add the missing dependency.

Fixes: 130575935
Test: treehugger
Change-Id: If32c03410fbdb3945bf20f7405de13dc8cd83038
2019-04-16 22:40:25 +00:00
Martin Stjernholm 5c5d59ba8f Exclude lib/arm(64) from the library absence check.
Test: m systemimage on cf_x86_phone-userdebug (in internal and AOSP).
Test: Check that the generated find command works on MacOS
Bug: 124293228
Change-Id: I5dfb534aa2bc24a8d0a75fde31b139a6ed86e6a5
2019-04-16 16:21:31 +01:00
Jiyong Park c66d72100e Merge "Add updatable_apex.mk" into qt-dev
am: af11c9f4fd

Change-Id: I64594110dfc7f1f80c61e3ceb9af6df383b88628
2019-04-16 07:43:56 -07:00
Tao Bao 5db3c58919 Merge "releasetools: Enable a few tests in OtaFromTargetFilesTest." am: 56215ba930
am: dc0ad08e49

Change-Id: I614c6d54d93cf5e3fb6b603b8640f5652c4dd8d3
2019-04-16 07:27:26 -07:00
TreeHugger Robot af11c9f4fd Merge "Add updatable_apex.mk" into qt-dev 2019-04-16 14:26:41 +00:00
Tao Bao dc0ad08e49 Merge "releasetools: Enable a few tests in OtaFromTargetFilesTest."
am: 56215ba930

Change-Id: Iccce31970307dff8bf61d6495ff3a65bff3429ed
2019-04-16 07:22:17 -07:00
Tao Bao 56215ba930 Merge "releasetools: Enable a few tests in OtaFromTargetFilesTest." 2019-04-16 14:15:28 +00:00
Cyan Hsieh dbcaa69f23 Merge "Revert "Add the entire boot image to boot.zip"" am: aa808134a2
am: 43a2566277

Change-Id: I7dc66cf18ee1e30130ba7d89f3f1e1827c3bc22b
2019-04-16 05:11:03 -07:00
Cyan Hsieh 43a2566277 Merge "Revert "Add the entire boot image to boot.zip""
am: aa808134a2

Change-Id: I02e63b6e7fb9ee821ec250c67b1fff8edd107739
2019-04-16 05:06:53 -07:00
Treehugger Robot aa808134a2 Merge "Revert "Add the entire boot image to boot.zip"" 2019-04-16 11:45:21 +00:00
Victor Chang 8d5440ca6f [automerger skipped] Merge "Remove libicu*.so from /system" into qt-dev
am: 603574b1d0 -s ours
am skip reason: change_id I1c2ab41aa0b19f71025e2dd09be9b9bd306e8616 with SHA1 c164b8ef13 is in history

Change-Id: Ia652ecb960d4332b3e5fb6dc2713fc36c03da1fd
2019-04-16 04:10:55 -07:00
Victor Chang 603574b1d0 Merge "Remove libicu*.so from /system" into qt-dev 2019-04-16 11:04:37 +00:00
David Brazdil 5b80eb935a [automerger skipped] Enable core platform API warnings on non-user builds
am: 38cd7f3c8b -s ours
am skip reason: change_id I2f4be42373de9fdbc71c3178de6d34e07809f13a with SHA1 f5b3fc854f is in history

Change-Id: I7eb0d4b898ee701871ca6c4cc5d2d148585831bc
2019-04-16 02:14:01 -07:00