Commit graph

50076 commits

Author SHA1 Message Date
Dan Willemsen
7f25f2aed9 TARGET_FS_CONFIG_GEN is a list, not a single path
Bug: 130787336
Test: m oemaids_header_gen oemaids_headers passwd group
Test: Set TARGET_FS_CONFIG_GEN to a list of paths
Change-Id: I5186b378fea8865f46cfd891420ba576f36e2565
2019-04-18 17:16:50 +00:00
Colin Cross
acd34d6dd4 Merge "Remove AAPT1 support"
am: aa0aa5e5c8

Change-Id: I4899ac7dfc0b82ba576e7c5dfbc627fd1b77e6ba
2019-04-17 22:00:09 -07:00
Treehugger Robot
aa0aa5e5c8 Merge "Remove AAPT1 support" 2019-04-18 04:47:34 +00:00
Jiyong Park
0b83340ab5 Merge "Add updatable_apex.mk"
am: 3cd4267b79

Change-Id: I6483fafea7d54f979423750b2cc7c50d2a76e9e6
2019-04-17 20:57:55 -07:00
Treehugger Robot
3cd4267b79 Merge "Add updatable_apex.mk" 2019-04-18 03:49:25 +00:00
Daniel Norman
99a82fcb0d Merge "Runs python formatter and linter over merge_target_files."
am: 8551d21cef

Change-Id: Ifc1de88529faf40df7506a1a5f29dd672ba4eefe
2019-04-17 19:42:36 -07:00
Treehugger Robot
8551d21cef Merge "Runs python formatter and linter over merge_target_files." 2019-04-18 02:31:19 +00:00
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
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
Tom Cherry
c9bb097bee Merge "Remove TARGET_ROOT_OUT_SBIN / TARGET_ROOT_OUT_SBIN_UNSTRIPPED" 2019-04-17 23:26:13 +00: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
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
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
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
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
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
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
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
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
Cyan Hsieh
4d5f5ff943 Revert "Add the entire boot image to boot.zip"
This reverts commit c0ed5e7c56.

Reason for revert: this patch cause build breakage on aosp-master-throttled (aosp_qemu_trusty-userdebug)

Bug: 130376456
Change-Id: Iab03d21219674691bd8bf6b2e5004508ebb862b9
2019-04-16 09:10:11 +00:00
Colin Cross
e75840fe4d Add default proguard flags from guava
Guava 27.1 causes some warnings in R8, silence them.

Bug: 130306229
Test: m checkbuild
Change-Id: Ia9948d597538a16c5b7ab26a2e41eebde52e7427
Merged-In: Ia9948d597538a16c5b7ab26a2e41eebde52e7427
Exempt-From-Owner-Approval: cherry pick
(cherry picked from commit b4917146aa)
2019-04-15 21:44:50 -07:00
Calin Juravle
051f55b5cd Merge "Add the entire boot image to boot.zip"
am: fcafa2de6e

Change-Id: Idf86241dff5c43fc52dd61bcc961bf9b590cd71c
2019-04-15 20:18:17 -07:00
Treehugger Robot
fcafa2de6e Merge "Add the entire boot image to boot.zip" 2019-04-16 03:10:34 +00:00
Calin Juravle
c0ed5e7c56 Add the entire boot image to boot.zip
Add all the boot image files necessary of offline inspection and
compilation in a single zip file (boot.zip).

This replaces the previous boot_profiles_jars.zip which contained only the
jar files.

Bug: 130376456
Test: m dist
Change-Id: I7e711369e7d56630c168c01df60a8c2672d60927
2019-04-16 01:07:52 +00:00
David Brazdil
8898b076f5 Merge "Enable core platform API warnings on non-user builds"
am: 20bc556e2e

Change-Id: Ifd15314589427d5484955a3e6435c61000719223
2019-04-15 14:13:10 -07:00
David Brazdil
20bc556e2e Merge "Enable core platform API warnings on non-user builds" 2019-04-15 20:59:41 +00:00
David Brazdil
f5b3fc854f Enable core platform API warnings on non-user builds
Core platform API violation reporting is disabled by default and can be
enabled by setting the persist.debug.dalvik.vm.core_platform_api_policy
property. Set it to "just-warn" for non-user builds and leave disabled
on user builds.

Test: builds, boots
Bug: 125701194
Change-Id: I2f4be42373de9fdbc71c3178de6d34e07809f13a
2019-04-15 16:12:59 +01:00
Tao Bao
69909c96ba releasetools: Enable a few tests in OtaFromTargetFilesTest.
They used to be disabled due to the assertion of search_path in setUp()
function, which is not a prerequisite for most of the tests.

Bug: 112080715
Test: `atest releasetools_test`
Test: TreeHugger
Change-Id: I3cbaf42aa09dba0b87a64e11d97de9b3f7af7a47
2019-04-15 07:33:32 -07:00
Isaac Chen
b1056bae51 Merge "Change emulator system image to unsparse format"
am: d18be7f8db

Change-Id: I689acaf7ae8fe416879eb49f31d9bf02824b0452
2019-04-15 05:11:58 -07:00
Isaac Chen
d18be7f8db Merge "Change emulator system image to unsparse format" 2019-04-15 11:57:49 +00:00
Tao Bao
4a5539cb99 Merge "relesetools: Enable releasetools_test in presubmit."
am: 2bfc94ebc6

Change-Id: If54e8a9ecd10a4c30fa0c50ec9d3eb1ac03eaa81
2019-04-14 08:21:15 -07:00
Tao Bao
2bfc94ebc6 Merge "relesetools: Enable releasetools_test in presubmit." 2019-04-14 15:09:19 +00:00
Andreas Gampe
8210b9aa41 Merge "Build: Include lock-inversion agent in debug builds"
am: 7ef6d0d39e

Change-Id: I55a86b9fe1f5cb7c97ddb478f3eb77ca2e54c304
2019-04-13 09:25:23 -07:00