Commit graph

18869 commits

Author SHA1 Message Date
Colin Cross
009981c5e4 Merge "Use framework.aidl built by Soong"
am: ab2b34b8fd

Change-Id: Ib32c4eb3d1ff205fc3abc1a5a8527aed80f74990
2019-04-21 10:29:30 -07:00
Colin Cross
ab2b34b8fd Merge "Use framework.aidl built by Soong" 2019-04-21 17:20:17 +00:00
Dan Willemsen
cc12e1759d Merge "Fix typo of PRODUCT_BUILD_ODM_IMAGE"
am: a8abd3beb7

Change-Id: I1605dbd4a69c117d07ae469244f4fc3c98a05020
2019-04-19 23:36:47 -07:00
Treehugger Robot
a8abd3beb7 Merge "Fix typo of PRODUCT_BUILD_ODM_IMAGE" 2019-04-20 06:26:04 +00:00
Dan Willemsen
6aeacea8c7 Merge "Master is now designated for R. Update MAX_PLATFORM_VERSION, etc."
am: 91871f3692

Change-Id: Idca43a79f8bf8129eb16e4f2d56117ebc1ce160c
2019-04-19 19:00:42 -07:00
Dan Willemsen
91871f3692 Merge "Master is now designated for R. Update MAX_PLATFORM_VERSION, etc." 2019-04-20 01:06:00 +00:00
Dan Willemsen
69cabb9607 Merge changes from topics "obsolete_broken_dup_copy_headers", "obsolete_broken_phony_targets"
am: 0b683a8f8d

Change-Id: Id0b3df7ea67ce7d14fd74478831ec1c974b30cb8
2019-04-19 17:08:56 -07:00
Dan Willemsen
e0ea6c8c9a Obsolete BUILD_BROKEN_PHONY_TARGETS
am: 407ca587be

Change-Id: Id49e8eaf359c21c906c350604bed1f1719609c4d
2019-04-19 17:08:01 -07:00
Dan Willemsen
25a6937d34 Fix typo of PRODUCT_BUILD_ODM_IMAGE
Bug: 130879723
Test: treehugger
Change-Id: Ibe6523ca77aeb1ff6fdd138dcf2bfa46bcdeee59
2019-04-19 15:00:12 -07:00
Dan Willemsen
1d4a56f1a0 Obsolete BUILD_BROKEN_DUP_COPY_HEADERS
There are no remaining users.

Test: treehugger
Change-Id: I1fd5b933372e3ea391c121d265f41c35b832b206
2019-04-19 18:28:53 +00:00
Dan Willemsen
407ca587be Obsolete BUILD_BROKEN_PHONY_TARGETS
There are no remaining users.

Test: treehugger
Change-Id: Ice6f25a59265305e7e5d3dd041b16cd04674dd1e
2019-04-19 11:26:14 -07:00
Tao Bao
b4512fe596 Merge "Add support for TARGET_SCREEN_DENSITY"
am: 2a41c7e48a

Change-Id: Id741efde3e7e187775013b2a84f9b5c46865921f
2019-04-19 10:33:47 -07:00
Anton Hansson
45a40da0d5 Add support for TARGET_SCREEN_DENSITY
This variable is used to populate the ro.sf.lcd_density property
in /vendor/build.prop, as well as choosing the correct density
bucket for assets in recovery.

Bug: 118676832
Test: inspect taimen and crosshatch in recovery
Test: adb shell getprop ro.sf.lcd_density
Change-Id: I80cf4d28ecfbae17f1ee206a279e7d9144bd7c05
Merged-In: I80cf4d28ecfbae17f1ee206a279e7d9144bd7c05
(cherry picked from commit 0dc9878af0)
2019-04-19 09:19:53 -07:00
Calin Juravle
45db542051 Merge changes I25b0c03e,I8a8a93ca
am: 442942c4de

Change-Id: I7adfbb648c6f5119e9a71cf3302c8ac708c75adc
2019-04-18 19:12:35 -07:00
Calin Juravle
442942c4de Merge changes I25b0c03e,I8a8a93ca
* changes:
  Add the entire boot image to boot.zip
  Disable iorapd by default
2019-04-19 01:57:09 +00:00
Calin Juravle
6bfdcda0e6 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: I25b0c03ee9e7a2c2ff25db406656ce79baff5a46
Merged-In: Ib71c4fcc0d451570d0bb0584745487c54f884fd9
(cherry picked from commit 3dfae3f149)
2019-04-18 17:48:39 -07:00
Colin Cross
eaa2c875f0 Merge "Don't set LOCAL_SDK_RES_VERSION to current if LOCAL_SDK_VERSION is core_current"
am: e55ec5ba1b

Change-Id: I391295c91268c7853ff97d01156d02a222344492
2019-04-18 14:41:32 -07:00
Treehugger Robot
e55ec5ba1b Merge "Don't set LOCAL_SDK_RES_VERSION to current if LOCAL_SDK_VERSION is core_current" 2019-04-18 21:15:18 +00:00
Dan Willemsen
a3f7a5fb6d Merge "TARGET_FS_CONFIG_GEN is a list, not a single path"
am: 0d4ee006db

Change-Id: Ie7733c22baa9a1f401dd5e2244a89e8bdc310a20
2019-04-18 12:48:08 -07:00
Treehugger Robot
0d4ee006db Merge "TARGET_FS_CONFIG_GEN is a list, not a single path" 2019-04-18 19:37:49 +00:00
Colin Cross
50bf3127d9 Use framework.aidl built by Soong
Bug: 130798034
Test: m checkbuild
Change-Id: I24621b41860ce1fd1c3ba067430c8d62b49d03cb
2019-04-18 12:06:27 -07:00
Colin Cross
85f2b4a680 Don't set LOCAL_SDK_RES_VERSION to current if LOCAL_SDK_VERSION is core_current
Removing AAPT1 support removed the distinction between unset
LOCAL_USE_AAPT2 and LOCAL_USE_AAPT2 := true, which enabled the
LCOAL_SDK_RES_VERSION setting for some modules that had previously
bypassed it because of LOCAL_USE_AAPT2 := true.  The workaround
was too broad, it shouldn't apply if LOCAL_SDK_VERSION is already
set to *current.  In particular, if it is core_current to disable
using framework-res.apk completely, then LOCAL_SDK_RES_VERSION
must not be set to current.

Fixes: 130782219
Test: atest android.server.wm.PrereleaseSdkTest
Change-Id: I250d65b1ef66e591f2c9779580df4cc3f0f2b028
2019-04-18 11:14:58 -07:00
Dan Willemsen
551909fd58 Merge changes from topic "make_deprecation"
am: c1a836bab0

Change-Id: I02a57f817e6d459d0c0f3607fbb0169e29addb18
2019-04-18 10:58:56 -07:00
Dan Willemsen
c1a836bab0 Merge changes from topic "make_deprecation"
* changes:
  Add infrastructure for deprecating module types
  Mark BUILD_* as readonly
2019-04-18 17:44:19 +00:00
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
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
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
1702d2a721 Merge "Optimize build for PRODUCT_BUILD_SYSTEM_IMAGE := false case."
am: 953ec4cd70

Change-Id: Ic404faa6a2deac5fd7c1fb5a37ab1008a9cd7daf
2019-04-17 10:24:13 -07:00
Bill Peckham
953ec4cd70 Merge "Optimize build for PRODUCT_BUILD_SYSTEM_IMAGE := false case." 2019-04-17 17:11:10 +00: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
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
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
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