Commit Graph

19954 Commits

Author SHA1 Message Date
Paul Scovanner 5c17bbc567 Update Security String to 2019-05-05
Bug:128322951
2019-04-05 23:46:54 +00:00
Paul Scovanner 2db03695f4 [DO NOT MERGE] Update Security String to 2019-06-01
Bug:129374896
2019-04-05 23:32:13 +00:00
Nicolas Geoffray 0f25cbf342 Pass DEXPREOPT_USE_APEX_IMAGE to soong.
Test: lunch walleye_jitzygote-userdebug m && all odex file use the apex image
Bug: 119800099

(cherry picked from commit 0639b7de03)

Change-Id: Ic76f3ad6da0425479fbe660efe0a0677e60771a2
Merged-In: Ieb8f36b94264496a41998d4ceca30e1f41a98ebe
2019-04-05 13:59:04 +01:00
Jiyong Park 678ace7e77 Don't feed framework.jar to proguard for vendor apks
We used to add framework.jar to proguard via -systemjars option even
for the apks building againsd SDK. This was because the app might have
references to hidden APIs via static libraries, etc.

However, for vendor apks, the use of hidden API is strictly prohibited.
So it is fine to not include framework.jar. Furthermore, including
framework.jar even causes problems in some cases; if a java library
(e.g., android.hidl.base-V1.0-java) is statically linked to both the app
and the framework.jar, -systemjars frameworks.jar forcibly removes
classes in the library from the app to have references to the non-public
classes in framework.jar. This could fail some compliance tests.

Fixing the problem by not raising SDK for apks located in vendor or odm
partitions.

Bug: 128574081
Test: m
Merged-In: If2b658fead5b4bb4d8c023a37eb57a37ad9b741d
Change-Id: If2b658fead5b4bb4d8c023a37eb57a37ad9b741d
(cherry picked from commit eadd1bdb8e)
2019-04-05 21:41:00 +09:00
TreeHugger Robot f9a550621b Merge "Build non-sparse super image if necessary." into qt-dev 2019-04-05 10:17:16 +00:00
TreeHugger Robot da72f69a2b Merge "Remove 'column' from modules target" into qt-dev 2019-04-05 06:00:09 +00:00
Yifan Hong c3664703f8 Build non-sparse super image if necessary.
If TARGET_USERIMAGES_SPARSE_EXT_DISABLED is set, don't provide
--sparse to lpmake, so that a non-sparse super image is built.

Test: build with the flag set.
Bug: 120041578
Change-Id: I5a26e4c793b0e2ddc89e9c38c8828ac21044e78a
Merged-In: I5a26e4c793b0e2ddc89e9c38c8828ac21044e78a
2019-04-04 16:36:25 -07:00
Yifan Hong 8b7fe36968 supernod: make intermediates directory.
Bug: 120041578

Test: delete the directory, then `m supernod`
Change-Id: If2f153fc8815b1bbf77774849be9cc2cdb5fd913
Merged-In: If2f153fc8815b1bbf77774849be9cc2cdb5fd913
2019-04-04 13:30:23 -07:00
Johan Harvyl ca1dbcc809 Remove 'column' from modules target
The standard target modules stopped working when restrictions in
soong were introduced to which binaries are allowed to be used during
builds.

Listing a very large amount of modules in columns does not make it
more readable and harder to work with in tools so just drop it.

Bug: 129800175
Test: make modules

(cherry picked from commit 7005d4f4cc)

Change-Id: I317f6eb4ba5ea633264939a9a58f716bdb36596e
2019-04-04 13:19:51 -07:00
Ian Pedowitz 0772f2a498 Android Q is Android 10
Bug: 129683166
Bug: 129943426
Test: source build/envsetup.sh && lunch blueline-userdebug && m -j cts
docs tests
Test: Flashed build to blueline, ensured it booted
Test: Verified "10" under Settings -> About phone -> Android version
Change-Id: Idec1479d93876bc57711c31e70f34008a05881d1
2019-04-04 09:12:21 -07:00
joker.yang 40301d8f1d Merge "Statements in build system such as ifeq (true,$(LOCAL_VENDOR_MODULE)) has a poor compatibility" am: 78ec599720 am: 0e2559c2d6
am: 680a116cba

Change-Id: I04cf92309e489b4304ca4f62c6ebce51489e5b9f
2019-04-03 09:40:15 -07:00
joker.yang 680a116cba Merge "Statements in build system such as ifeq (true,$(LOCAL_VENDOR_MODULE)) has a poor compatibility" am: 78ec599720
am: 0e2559c2d6

Change-Id: I4e1f9781f903b4d3ef55b30b087c89126bc09db6
2019-04-03 09:24:30 -07:00
joker.yang 0e2559c2d6 Merge "Statements in build system such as ifeq (true,$(LOCAL_VENDOR_MODULE)) has a poor compatibility"
am: 78ec599720

Change-Id: I7c6759b45b8e7af3df7cf31288a9d484098704cf
2019-04-03 09:07:49 -07:00
Treehugger Robot 78ec599720 Merge "Statements in build system such as ifeq (true,$(LOCAL_VENDOR_MODULE)) has a poor compatibility" 2019-04-03 15:27:21 +00:00
joker.yang a75c9a5079 Statements in build system such as ifeq (true,$(LOCAL_VENDOR_MODULE)) has a poor compatibility
We have developed a vendor module and set LOCAL_VENDOR_MODULE := true<space> (Added a space character at the end)
The android build system then can't installed it in the right partition until we removed the extra space character.

bug: 129725067

Change-Id: I081ffe7f39a9c850007ba304c815436500be694c
2019-04-03 01:31:43 +00:00
Martin Stjernholm ff2f484864 Merge "Drop libsigchain from the system image." am: c712ac1001 am: 683996193e
am: 11eb0df260

Change-Id: I0af560e8e50f2cbd8c6435967092f46eb4082635
2019-04-01 12:37:25 -07:00
Martin Stjernholm 11eb0df260 Merge "Drop libsigchain from the system image." am: c712ac1001
am: 683996193e

Change-Id: Iebf5cc3e43ef91f57948fb36b834eadd3b7d5591
2019-04-01 12:33:17 -07:00
Martin Stjernholm 683996193e Merge "Drop libsigchain from the system image."
am: c712ac1001

Change-Id: Ic7c2ad24c51069648155224ca2350ca91f613292
2019-04-01 12:28:04 -07:00
Martin Stjernholm c712ac1001 Merge "Drop libsigchain from the system image." 2019-04-01 19:15:25 +00:00
Martin Stjernholm f8b6fefcd1 Drop libsigchain from the system image.
It is now in the Runtime APEX and considered internal there.

Test: Flash and boot
Test: atest CtsCompilationTestCases CtsBionicTestCases
Bug: 118374951
Bug: 124293228
Change-Id: I33bb9c238d7db46795deb592c9d20fe6591c1654
2019-04-01 18:37:06 +01:00
Yifan Hong 7a8ffbeb9f resolve merge conflicts of 7bd8a3692f to master
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I16278376fb4a2b26f15b675016d00819ea99c296
2019-04-01 09:53:23 -07:00
Yifan Hong 7bd8a3692f Merge "Move super.img to obj/PACKAGING" am: c2fe916233
am: b2c5bdd9a5

Change-Id: I5d10c1baa454ef7d94203bed3bfeba56f301d485
2019-04-01 09:38:12 -07:00
Yifan Hong b2c5bdd9a5 Merge "Move super.img to obj/PACKAGING"
am: c2fe916233

Change-Id: I71deec3850e2bd7b8cb2b4cefe926d3f49f732e7
2019-04-01 09:35:02 -07:00
Treehugger Robot c2fe916233 Merge "Move super.img to obj/PACKAGING" 2019-04-01 16:21:07 +00:00
Yifan Hong 5478754cd6 Move super.img to obj/PACKAGING
To avoid the confusion. super.img isn't intended to be flashed
during day-to-day development.

Test: m superimage
Bug: 128891161
Change-Id: I9d62e5929b415343b2d890ab21e6ae51175af2ae
2019-03-29 14:47:28 -07:00
Anton Hansson cf0b72a241 Merge "Access PRODUCT_ variables directly" am: 8adf501905 am: ffed666e07
am: 9ff3ac88c6

Change-Id: Ica9e69e2252d89c7cbc5681b772b78e7bc3913e4
2019-03-29 10:16:52 -07:00
Anton Hansson 2abc1dcb64 Merge "Automate the strip and assignment of PRODUCT_ vars" am: b5cec0d792 am: 15780ecbbb
am: 23919b3dd4

Change-Id: I4cfedab055b60212262274a6e31c1dae6234aa02
2019-03-29 10:15:44 -07:00
Anton Hansson 9ff3ac88c6 Merge "Access PRODUCT_ variables directly" am: 8adf501905
am: ffed666e07

Change-Id: I9880fdf0b3a242932b9402b384222f3d45e6d5cd
2019-03-29 10:12:06 -07:00
Anton Hansson 23919b3dd4 Merge "Automate the strip and assignment of PRODUCT_ vars" am: b5cec0d792
am: 15780ecbbb

Change-Id: I64ed86f6e27fd0da2058b832fc1fb277af0d490d
2019-03-29 10:11:13 -07:00
Anton Hansson ffed666e07 Merge "Access PRODUCT_ variables directly"
am: 8adf501905

Change-Id: Ic22d18e3bba7bd2dc744978f8b004717a5737023
2019-03-29 10:08:00 -07:00
Anton Hansson 15780ecbbb Merge "Automate the strip and assignment of PRODUCT_ vars"
am: b5cec0d792

Change-Id: Ia916e2244b34b5f88a9065356a47615a01839a5d
2019-03-29 10:07:04 -07:00
Anton Hansson 8adf501905 Merge "Access PRODUCT_ variables directly" 2019-03-29 16:54:47 +00:00
Anton Hansson b5cec0d792 Merge "Automate the strip and assignment of PRODUCT_ vars" 2019-03-29 16:54:25 +00:00
Martin Stjernholm 480ab2ad7c Merge "Make the APEX lib absence check optional, for local use." am: 20ac920654 am: 4598286860
am: 9791a3c4d7

Change-Id: I5fd9cb75aed919c8d933e9e8a825a32eae69372f
2019-03-29 07:10:20 -07:00
Martin Stjernholm 9791a3c4d7 Merge "Make the APEX lib absence check optional, for local use." am: 20ac920654
am: 4598286860

Change-Id: Ief2749e8afa022d3a430dcd5ea376c2dee5496a1
2019-03-29 07:06:09 -07:00
Martin Stjernholm 4598286860 Merge "Make the APEX lib absence check optional, for local use."
am: 20ac920654

Change-Id: I076fa80c2a5496eaf0619a8c6a80fc77d698e0ee
2019-03-29 07:01:58 -07:00
Treehugger Robot 20ac920654 Merge "Make the APEX lib absence check optional, for local use." 2019-03-29 13:43:32 +00:00
Dan Willemsen e5b842206f Merge "Stop installing host packages via PRODUCT_PACKAGES" am: 672e98fac8 am: cc2155aa37
am: 7e8cc8ce6c

Change-Id: I13151a5e1918d5de18dbda6939da14a4d1be36b1
2019-03-28 20:34:08 -07:00
Dan Willemsen 7e8cc8ce6c Merge "Stop installing host packages via PRODUCT_PACKAGES" am: 672e98fac8
am: cc2155aa37

Change-Id: I11054d1c97426e30baafa97ec59bc5df45d27b39
2019-03-28 20:30:01 -07:00
Dan Willemsen cc2155aa37 Merge "Stop installing host packages via PRODUCT_PACKAGES"
am: 672e98fac8

Change-Id: I0db73bc1f59b8f50f5529cbd0992fab9aa808a1b
2019-03-28 20:25:48 -07:00
SzuWei Lin 3f4ca06313 Merge "Fix build error on empty ramdisk" am: 5d225276ca am: debaf1b8af
am: 3e3c738d7f

Change-Id: I239d210569588636fde36bc2a545b80a16dc2509
2019-03-28 20:22:02 -07:00
Dan Willemsen 672e98fac8 Merge "Stop installing host packages via PRODUCT_PACKAGES" 2019-03-29 03:20:52 +00:00
SzuWei Lin 3e3c738d7f Merge "Fix build error on empty ramdisk" am: 5d225276ca
am: debaf1b8af

Change-Id: I0604d288ab42f3a347b6f5de22d7fb4742f6ea05
2019-03-28 20:17:53 -07:00
SzuWei Lin debaf1b8af Merge "Fix build error on empty ramdisk"
am: 5d225276ca

Change-Id: I4f550bbd49dbbeb90d2855c13fb066bcd33b8e4a
2019-03-28 20:13:43 -07:00
Treehugger Robot 5d225276ca Merge "Fix build error on empty ramdisk" 2019-03-29 03:03:00 +00:00
Anton Hansson 8dab0a6f50 Access PRODUCT_ variables directly
This CL simplifies the PRODUCTS.$(INTERNAL_PRODUCT).X accesses of
product variables, and removes unnecessary stripping of them.

Replace: '\$\(PRODUCTS\.\$\(INTERNAL_PRODUCT\)\.([^\)]*)\)' with '$(\1)'
Replace: '\$\(strip\s*\$\(PRODUCT_([^\)]*)\)\)' with '$(PRODUCT_\1)'

A few minor manual tweaks.

Bug: 116769560
Test: presubmit
Change-Id: I70c54f1582e3cc780028535960147d99ebc2e0e1
2019-03-28 15:54:25 +00:00
Anton Hansson 13ea2a6a7d Automate the strip and assignment of PRODUCT_ vars
With this change, all PRODUCT_ variables are treated the same
when it comes to stripping and assigning them to their final
variable name. In the past, all the PRODUCT variables needed
to be listed in two places to achieve this.

The documentation previously attached to the strip/assignment
is moved to the PRODUCT_ variable list in product.mk.

Also refactor some of the default value logic to cope with
the new automation.

Many places in the build system that currently refer to
$(PRODUCTS.$(INTERNAL_PRODUCT).X) can now be modified to
use $(X) directly.

Bug: 116769560
Test: verified noop on PRODUCT_ variables on all products in the tree
Change-Id: I5677c355e81359b1d3c0db2a2232941097a05047
2019-03-28 15:26:49 +00:00
Martin Stjernholm c9d5858f58 Make the APEX lib absence check optional, for local use.
Test: m systemimage (with and without failure)
Bug: 124293228
Bug: 129466457
Change-Id: I8bf5ba51232bb9961bdedd56d0f17ee1d8698f54
2019-03-28 15:08:32 +00:00
SzuWei Lin 29770fa2bf Fix build error on empty ramdisk
package `init_vendor` is the only content of ramdisk so far.
We would get build error if we do not include init_vendor.
The patch fix the build error for the case that ramdisk is empty.

Bug: 129386309
Test: lunch aosp_arm64_ab-userdebug; make ramdisk -j
Test: Build pass
Change-Id: I7c7c828b5f29350268d4789393b90740dd68162d
2019-03-28 13:41:01 +00:00
Colin Cross c2bf5dd2a3 Merge "Understand the support library/androidx @Keep annotations" am: 3f6483cb0f am: d4ada79abd
am: 2172041a44

Change-Id: I5a72c50d7ef89cf8f4a4130b2fa13e1b6f297f03
2019-03-27 11:33:24 -07:00
Colin Cross 2172041a44 Merge "Understand the support library/androidx @Keep annotations" am: 3f6483cb0f
am: d4ada79abd

Change-Id: Iec62861e620719e4a9601b5beee7208569954c5b
2019-03-27 11:25:16 -07:00
Colin Cross d4ada79abd Merge "Understand the support library/androidx @Keep annotations"
am: 3f6483cb0f

Change-Id: I4997b8d4aa6799eb262453b09c0549a509dcc012
2019-03-27 11:21:37 -07:00
Colin Cross 38b48debc5 Understand the support library/androidx @Keep annotations
Copied from tools/base/build-system/gradle-core/src/main/resources/com/android/build/gradle/proguard-common.txt.

Fixes: 129311848
Test: none
Change-Id: Ie8b40b416c8772a550bb4d1f7bd6e7e944cdd166
2019-03-26 23:44:01 +00:00
Sasha Smundak ef6827f985 Merge "Eliminate ENABLE_DEFAULT_TEST_LOCATION as it is always true" am: d7060a50f9 am: aa2eb553d8
am: 20f8f5c6ee

Change-Id: I394ca617f87d15fd0c89d4e51458fa9815f380ee
2019-03-26 15:36:52 -07:00
Sasha Smundak 20f8f5c6ee Merge "Eliminate ENABLE_DEFAULT_TEST_LOCATION as it is always true" am: d7060a50f9
am: aa2eb553d8

Change-Id: I5aebaa6c8a4bcf203c4e930039b4476d356cfdfa
2019-03-26 15:27:16 -07:00
Sasha Smundak aa2eb553d8 Merge "Eliminate ENABLE_DEFAULT_TEST_LOCATION as it is always true"
am: d7060a50f9

Change-Id: Ice1a9ef05eadd59d45324c17a1c6e8f71f271828
2019-03-26 14:19:30 -07:00
Treehugger Robot d7060a50f9 Merge "Eliminate ENABLE_DEFAULT_TEST_LOCATION as it is always true" 2019-03-26 20:22:37 +00:00
Daniel Norman cf4e8bf0b5 Merge "Only call make_recovery_patch when BUILDING_SYSTEM_IMAGE." am: b455273444 am: 7100e93233
am: 2d5f9a0285

Change-Id: Id733c79d53407cccba52563a79e4bfab9cec03f7
2019-03-25 16:33:11 -07:00
Daniel Norman 2d5f9a0285 Merge "Only call make_recovery_patch when BUILDING_SYSTEM_IMAGE." am: b455273444
am: 7100e93233

Change-Id: I1c925936c6d5992bd9544e87ab59836f46090ebb
2019-03-25 16:29:24 -07:00
Daniel Norman 7100e93233 Merge "Only call make_recovery_patch when BUILDING_SYSTEM_IMAGE."
am: b455273444

Change-Id: I7eb9f6686af9750e9960de66f954087f4551416f
2019-03-25 16:25:20 -07:00
Sasha Smundak da25b691d3 Eliminate ENABLE_DEFAULT_TEST_LOCATION as it is always true
Bug: 117224272
Test: treehugger
Change-Id: Idd47ead31fcd89dbf728f140dc3353e5013ba352
2019-03-25 13:26:03 -07:00
Daniel Norman adf8096c77 Only call make_recovery_patch when BUILDING_SYSTEM_IMAGE.
The recovery patch gets put in the SYSTEM directory. Placing the
recovery patch here doesn't make sense when not building the system
image, as is the case for merged (system + vendor) builds.

Bug: 128838154
Test: Running make droid dist for a device target that sets PRODUCT_BUILD_SYSTEM_IMAGE to false.
Change-Id: Ib5ce8c8490024199f82d0c093e9a7ae2de5f71f5
2019-03-25 18:34:30 +00:00
Anton Hansson db064f1f1a Merge "Put DEVICE/PRODUCT overlays in different partitions" am: 94fa0e75cb am: fd946975d0
am: 691c979b62

Change-Id: I1e9c9b79b931229ed3142d1921d784a6bad7baed
2019-03-25 02:46:53 -07:00
Anton Hansson 691c979b62 Merge "Put DEVICE/PRODUCT overlays in different partitions" am: 94fa0e75cb
am: fd946975d0

Change-Id: Id4f8e8ce0ad6448d71b7a619805c4bae06cfcbca
2019-03-25 02:38:24 -07:00
Anton Hansson fd946975d0 Merge "Put DEVICE/PRODUCT overlays in different partitions"
am: 94fa0e75cb

Change-Id: I490160177bd0084721212d832dff8c0d721e2e14
2019-03-25 02:32:55 -07:00
Anton Hansson 94fa0e75cb Merge "Put DEVICE/PRODUCT overlays in different partitions" 2019-03-25 09:25:47 +00:00
Martin Stjernholm 0e727dd0eb Merge "Exclude libdexfile_external.so to fix aosp_marlin-userdebug builds." am: c62e31242d am: 5355757f74
am: 2242264224

Change-Id: Ice386f7debd22ea87376e617c7870119d7f7cc1d
2019-03-22 08:53:54 -07:00
Martin Stjernholm 2242264224 Merge "Exclude libdexfile_external.so to fix aosp_marlin-userdebug builds." am: c62e31242d
am: 5355757f74

Change-Id: I549c14bd6e5b678f55f9555c7789cab24cdfe937
2019-03-22 08:47:09 -07:00
Martin Stjernholm 5355757f74 Merge "Exclude libdexfile_external.so to fix aosp_marlin-userdebug builds."
am: c62e31242d

Change-Id: I01446f20619e93fd407a9085dba0c3511e15ca13
2019-03-22 08:43:22 -07:00
Martin Stjernholm c62e31242d Merge "Exclude libdexfile_external.so to fix aosp_marlin-userdebug builds." 2019-03-22 15:35:09 +00:00
Martin Stjernholm d185bb29ce Exclude libdexfile_external.so to fix aosp_marlin-userdebug builds.
Test: m systemimage
Bug: 124293228
Change-Id: I7a4744457396084ef9fd78d9c2f1efdabe0f981d
2019-03-22 14:24:08 +00:00
Anton Hansson cb8276fa93 Put DEVICE/PRODUCT overlays in different partitions
This change changes auto-generated RROs from DEVICE_PACKAGE_OVERLAYS
to be generated in the vendor partition, as opposed to /product where
they were generated in the past.

Note that PRODUCT_PACKAGE_OVERLAYS continue generating RRO packages
to /product, which means that a single app can be overlayed from
different partitions. These RROs have been given module and package
names based on their location.

Bug: 127758779
Test: verify noop on presubmit targets
Change-Id: I5cee70e28e3969e67b2d83eaf25d9c6e3a11102d
2019-03-22 13:25:20 +00:00
Martin Stjernholm 0e60df18e6 Merge "Check that Runtime APEX libraries don't end up in /system/${LIB}." am: 02699e40ea am: 057b589a96
am: d3409149eb

Change-Id: If12e346e5a0ae7d7db8f15e8567adf29bf3e70ed
2019-03-22 05:55:42 -07:00
Martin Stjernholm d3409149eb Merge "Check that Runtime APEX libraries don't end up in /system/${LIB}." am: 02699e40ea
am: 057b589a96

Change-Id: I599ccc4bc86de67cd5961c215bcc05f01396755e
2019-03-22 05:50:28 -07:00
Martin Stjernholm 057b589a96 Merge "Check that Runtime APEX libraries don't end up in /system/${LIB}."
am: 02699e40ea

Change-Id: I2a939d8ecc6a94bec2b24f084d58d308afedb470
2019-03-22 05:46:18 -07:00
Treehugger Robot 02699e40ea Merge "Check that Runtime APEX libraries don't end up in /system/${LIB}." 2019-03-22 12:34:05 +00:00
Jiyong Park b52d505cf6 Merge "Follow symlink when creating symbols.zip" am: 1d38fe98d1 am: ca6cd2dcd3
am: 3bbb92bc72

Change-Id: Icaf93fe5f37c098ebba41695c8cc66b5cc778bec
2019-03-21 15:41:18 -07:00
Jiyong Park 3bbb92bc72 Merge "Follow symlink when creating symbols.zip" am: 1d38fe98d1
am: ca6cd2dcd3

Change-Id: I6e9bdbf18591f82c6379d9e2f413fecdc2ccfcf0
2019-03-21 15:36:57 -07:00
Jiyong Park ca6cd2dcd3 Merge "Follow symlink when creating symbols.zip"
am: 1d38fe98d1

Change-Id: I8b5c247ba8566596a4bb93a5017d7d089704f0c0
2019-03-21 15:32:42 -07:00
Treehugger Robot 1d38fe98d1 Merge "Follow symlink when creating symbols.zip" 2019-03-21 22:19:49 +00:00
Martin Stjernholm f1e7c7159b Check that Runtime APEX libraries don't end up in /system/${LIB}.
This is a stop-gap measure for a proper fix enforcing library "ownership" in
Soong: b/128708192

Test: m systemimage (with and without libs that exist in /system/lib)
Test: Check that this fails:
  m systemimage
  m out/target/product/taimen/system/lib/libjdwp.so
  m systemimage-nodeps
Bug: 124293228
Change-Id: Iac0d0cec7d9e216028a0caccfbb76838514d4a7b
2019-03-21 17:52:35 +00:00
Anton Hansson 64e23e56dd Merge "Read product/device RRO dirs separately from soong" am: cece1e03af am: df12b23c07
am: b66ccd067d

Change-Id: I2ae235110ef137f1e7b80f0b15f9b8d9375d6624
2019-03-21 04:45:47 -07:00
Anton Hansson b66ccd067d Merge "Read product/device RRO dirs separately from soong" am: cece1e03af
am: df12b23c07

Change-Id: If27141689086eecfd0286b5bfb8ef745f77ad49e
2019-03-21 04:41:36 -07:00
Anton Hansson df12b23c07 Merge "Read product/device RRO dirs separately from soong"
am: cece1e03af

Change-Id: I844450ebfaf6b48a8be390349d2794542073ad35
2019-03-21 04:36:24 -07:00
Anton Hansson cece1e03af Merge "Read product/device RRO dirs separately from soong" 2019-03-21 11:28:19 +00:00
Jiyong Park 88e0980ddf Follow symlink when creating symbols.zip
Due to the runtime APEX, the symbols directory now contains a symlink;
./apex/com.android.runtime -> com.android.runtime.debug (or .release).

Previously, this symlink itself was included in the symbols.zip file.
And this is causing problem to the online stack tool which does not
follow the symlink in the zip file. Instead of fixing the problem in the
stack tool side, this change let the packaging routine to follow the
symlink and copy the files behind the symlink as if they were under a
directory that isn't a symlink. (i.e.
./apex/com.android.runtime/bin/dex2oat is added)

Bug: 120846816
Test: m dist with marlin (flattened) and blueline (non-flattened)
examine symbols.zip file and check that unstripped shared libraries are
found under /apex/com.android.runtime directory
Change-Id: I1d1c787a2e8ab7209410dfa2cff749a7042e21b0
2019-03-21 18:48:16 +09:00
Bowgo Tsai d97130751f Merge "Only build system_other.avbpubkey when AVB is enabled" am: dce018769f am: 20d5f0f821
am: 5ce2f09a8e

Change-Id: I79f0f00969e30d53489f7e5a28423110a94e78e5
2019-03-21 00:24:04 -07:00
Bowgo Tsai 5ce2f09a8e Merge "Only build system_other.avbpubkey when AVB is enabled" am: dce018769f
am: 20d5f0f821

Change-Id: I7e505c8d169612e3eed0a5f54b126271d4af0577
2019-03-21 00:18:52 -07:00
Bowgo Tsai 20d5f0f821 Merge "Only build system_other.avbpubkey when AVB is enabled"
am: dce018769f

Change-Id: Ic65fb56351e3ae39291a22e5fb260b8e966218e6
2019-03-21 00:13:43 -07:00
Bowgo Tsai 8802b7119d Only build system_other.avbpubkey when AVB is enabled
/product/etc/security/avb/system_other.avbpubkey is only needed
when BOARD_AVB_ENABLE is true. This fixes the build error of
Marlin/Sailfish.

Bug: 123611926
Bug: 129029207
Test: make
Change-Id: I73f948d84f91cd6fbe49a2de7bf12e46eebe6ede
2019-03-21 14:26:33 +08:00
Vic Yang 5c38a6234d Merge changes from topic "vndk-no-vendor-variant" am: 30dda1da5e am: 38f68f7a2a
am: 1485ea8707

Change-Id: Ia7eaea708743f9f42f6fe605cb0edba7db36db4d
2019-03-20 21:58:12 -07:00
Vic Yang a2872a3578 Add module-target-built-files function am: 1b83413b5a am: 00e6eb93c9
am: 9b235bbcd5

Change-Id: Ib4f82e58c3c1f74e196b53854bb5ceb3bb6b3dab
2019-03-20 21:57:17 -07:00
Vic Yang 1485ea8707 Merge changes from topic "vndk-no-vendor-variant" am: 30dda1da5e
am: 38f68f7a2a

Change-Id: Idf7ab78b9ec5ed5e95c1b765dd2a02808d21c3ab
2019-03-20 21:46:43 -07:00
Vic Yang 9b235bbcd5 Add module-target-built-files function am: 1b83413b5a
am: 00e6eb93c9

Change-Id: I907180d6289d925f26717c44a094956c945d20a6
2019-03-20 21:45:57 -07:00
Bowgo Tsai dc80ab1bf0 Merge "Moving system_other key into product.img" am: 7e87c72fb0 am: 916e876f7a
am: 44446b2a50

Change-Id: Ic704ac1ee1b9e956753d5b67fb39046ac608d721
2019-03-20 21:45:30 -07:00
Bowgo Tsai 44446b2a50 Merge "Moving system_other key into product.img" am: 7e87c72fb0
am: 916e876f7a

Change-Id: If6c70e5e0d4fab45cabb86edc068f2c77d339d54
2019-03-20 21:40:19 -07:00
Vic Yang 38f68f7a2a Merge changes from topic "vndk-no-vendor-variant"
am: 30dda1da5e

Change-Id: I646d55e6195a24530bf22d1e7588b2dd99b27eba
2019-03-20 21:39:57 -07:00
Vic Yang 00e6eb93c9 Add module-target-built-files function
am: 1b83413b5a

Change-Id: I91a2d2fa1642bef1564b6efde554df55ffd2f8aa
2019-03-20 21:38:59 -07:00
Bowgo Tsai 916e876f7a Merge "Moving system_other key into product.img"
am: 7e87c72fb0

Change-Id: I29ba3d2056fca68a356cb26a8e17b29d415ed08e
2019-03-20 21:36:24 -07:00
Vic Yang 30dda1da5e Merge changes from topic "vndk-no-vendor-variant"
* changes:
  Add support for no-vendor-variant VNDK
  Add module-target-built-files function
2019-03-21 04:30:47 +00:00
Treehugger Robot 7e87c72fb0 Merge "Moving system_other key into product.img" 2019-03-21 04:26:21 +00:00
Anton Hansson 3f0f3d447e Merge "Fix the product-graph target" am: 2cad3f68c2 am: 0e941107d4
am: fe21a3cc76

Change-Id: I7b74cd0ddd6f8f9169ecb2e5b478b461a423797b
2019-03-20 10:57:38 -07:00
Anton Hansson fe21a3cc76 Merge "Fix the product-graph target" am: 2cad3f68c2
am: 0e941107d4

Change-Id: I532416a6c390a2e0ea0414a19049daedff1ca003
2019-03-20 10:54:26 -07:00
Anton Hansson 0e941107d4 Merge "Fix the product-graph target"
am: 2cad3f68c2

Change-Id: I02d010e837752ef4483a0c0fab06b3f5a8f863fa
2019-03-20 10:49:18 -07:00
Anton Hansson 2cad3f68c2 Merge "Fix the product-graph target" 2019-03-20 17:31:41 +00:00
Dan Willemsen 2e79dafed1 Stop installing host packages via PRODUCT_PACKAGES
Test: treehugger
Change-Id: I24ac93f3558116f4ddd96d22ef9bbd47240fdd06
2019-03-20 10:29:42 -07:00
Vic Yang 51512c558c Add support for no-vendor-variant VNDK
When TARGET_VNDK_USE_CORE_VARIANT is set to true, the vendor variant of
VNDK libraries are by default not installed.  Instead, the core variant
will be used by vendor binaries at runtime.

To ensure the core variant of VNDK libraries are installed, we also add
a flag LOCAL_VNDK_DEPEND_ON_CORE_VARIANT to indicate that the vendor
variant module depends on the core variant module.  This flag should be
set by Soong for all VNDK libraries without the vendor variant
installed.  When the flag is set, the vendor variant binary is also
compared against the core variant binary to ensure they are
functionally identical.

As we are merging the two variants for some libraries, we need a new
link type to denote a module is usable as both native:vndk and
native:platform.  We add native:platform_vndk for this.

Bug: 119423884
Test: With the corresponding Soong change, build with
      TARGET_VNDK_USE_CORE_VARIANT set to true.
Test: Add a dummy VNDK library and a dummy vendor binary that depends
      on it.  Build with no-vendor-variant VNDK and check the core
      variant is installed.
Test: Add conditional compilation based on __ANDROID_VNDK__ in the
      dummy VNDK library and check build fails.

Change-Id: I40000f2728e8193212113c1ee950e9d697f2d40d
2019-03-20 10:23:04 -07:00
Vic Yang 1b83413b5a Add module-target-built-files function
This is similar to module-built-files, except that it only returns
files built for the target, not the host.

Bug: 119423884
Test: Build with the no-vendor-variant VNDK change that uses this
      function.

Change-Id: I2a3d99003b05999eae01c0b90bb62b5263d65592
2019-03-20 10:22:21 -07:00
Anton Hansson 0a766e9afa Merge "Refactor generate_enforce_rro" am: bec4aa868a am: f5c74dd470
am: 5784c16fc4

Change-Id: I3d12f8a0f50429e8f54631bedec7e6caf667fb61
2019-03-20 09:23:38 -07:00
Anton Hansson ba2e4c4a5a Merge "Refactor and further simplify the RRO logic" am: 7c718f37f9 am: 5809544a5a
am: 79ff9538c7

Change-Id: I6220b4cfdd403c33076704abb7d670d391bd70e8
2019-03-20 09:21:21 -07:00
Anton Hansson 5784c16fc4 Merge "Refactor generate_enforce_rro" am: bec4aa868a
am: f5c74dd470

Change-Id: Id4ce71a884dda5a5abf6b131072a13f751b839cf
2019-03-20 09:18:39 -07:00
Anton Hansson 79ff9538c7 Merge "Refactor and further simplify the RRO logic" am: 7c718f37f9
am: 5809544a5a

Change-Id: Ib2de01d13b835d4a7dcd99eef37514e24c414c6c
2019-03-20 09:15:57 -07:00
Anton Hansson f82f85f0c9 Merge "Add comments and slight refactor auto-RRO logic" am: fce4d099c3 am: 9e8b7550b8
am: 33b3b1f565

Change-Id: Ic7a922d82d7676690cb7907f1e680552730621d5
2019-03-20 09:14:42 -07:00
Anton Hansson f5c74dd470 Merge "Refactor generate_enforce_rro"
am: bec4aa868a

Change-Id: I1f616f8020f85df60b89cdc3d0f489e9111d0454
2019-03-20 09:10:12 -07:00
Anton Hansson 33b3b1f565 Merge "Add comments and slight refactor auto-RRO logic" am: fce4d099c3
am: 9e8b7550b8

Change-Id: Ie6a6577eeb9eb9694968d10dd1cde1ea874da436
2019-03-20 09:09:25 -07:00
Anton Hansson 597255bc5e Merge "System-specific product sysprops" am: 4ea6474e95 am: ad0e43a4cb
am: 40bf1a78f2

Change-Id: I1e71d3b662dd27c9027129853e21bd5ac55a3e62
2019-03-20 09:08:35 -07:00
Anton Hansson 5809544a5a Merge "Refactor and further simplify the RRO logic"
am: 7c718f37f9

Change-Id: I90af301f8a7fd4713d6f8734080ce73128219fcf
2019-03-20 09:06:45 -07:00
Anton Hansson 9e8b7550b8 Merge "Add comments and slight refactor auto-RRO logic"
am: fce4d099c3

Change-Id: Ie1c5bfcddaabb8315cd4971a21900fddeba1e426
2019-03-20 08:57:07 -07:00
Anton Hansson 40bf1a78f2 Merge "System-specific product sysprops" am: 4ea6474e95
am: ad0e43a4cb

Change-Id: If4199330a673fd62199d3435e57b5298378a0e3a
2019-03-20 08:56:58 -07:00
Anton Hansson ad0e43a4cb Merge "System-specific product sysprops"
am: 4ea6474e95

Change-Id: Ic86991b8facce69736a1bb484d095b3a132cbd1d
2019-03-20 08:48:31 -07:00
Anton Hansson bec4aa868a Merge "Refactor generate_enforce_rro" 2019-03-20 15:18:19 +00:00
Anton Hansson 7c718f37f9 Merge "Refactor and further simplify the RRO logic" 2019-03-20 14:35:25 +00:00
Anton Hansson fce4d099c3 Merge "Add comments and slight refactor auto-RRO logic" 2019-03-20 13:19:56 +00:00
Anton Hansson 4ea6474e95 Merge "System-specific product sysprops" 2019-03-20 12:40:44 +00:00
Anton Hansson 3ef0773932 Merge "Rename DEVICE arg in common buildprops script" am: c371f19e89 am: a0ea5a17e8
am: 1ed2fafd6a

Change-Id: I0eec28ce7fbe8f29588993b1986b70cf52b0497e
2019-03-20 04:09:51 -07:00
Anton Hansson 057f51a2c2 Merge "Fix missing modules check for dont_bother goals" am: f9b6cd6593 am: c61bed91be
am: 34ec0cb0b1

Change-Id: If86ea8d9462a50f0175d5e519eba7dc4b2a73fe7
2019-03-20 04:07:53 -07:00
Anton Hansson 627cf057f9 Fix the product-graph target
Skips the step that invokes dot from the build, and instead
prints suitable commands to convert to image formats.

Bug: 114729998
Test: m product-graph
Change-Id: I172e1a792c32c2685d2f439f414dc66267ed6b83
2019-03-20 11:03:59 +00:00
Anton Hansson 1ed2fafd6a Merge "Rename DEVICE arg in common buildprops script" am: c371f19e89
am: a0ea5a17e8

Change-Id: I692a07be00cf219e5ce5d286c0aae7585c047c48
2019-03-20 03:44:52 -07:00
Anton Hansson 34ec0cb0b1 Merge "Fix missing modules check for dont_bother goals" am: f9b6cd6593
am: c61bed91be

Change-Id: I18623ca6f24e3f1aa0b91e0f6b0beaa79fb74643
2019-03-20 03:43:33 -07:00
Anton Hansson a0ea5a17e8 Merge "Rename DEVICE arg in common buildprops script"
am: c371f19e89

Change-Id: I24bd162fcfe728f3972eb4e3ce6d5df74ba8bf50
2019-03-20 03:28:08 -07:00
Anton Hansson c61bed91be Merge "Fix missing modules check for dont_bother goals"
am: f9b6cd6593

Change-Id: I1e1707cf4323851f1465f4dfcc2324a22e5049b8
2019-03-20 03:27:22 -07:00
Anton Hansson c371f19e89 Merge "Rename DEVICE arg in common buildprops script" 2019-03-20 10:25:01 +00:00
Anton Hansson f9b6cd6593 Merge "Fix missing modules check for dont_bother goals" 2019-03-20 10:11:50 +00:00
Bowgo Tsai e4544b1c02 Moving system_other key into product.img
Currently system_other AVB public key is placed in system.img.
However, this makes it's harder to have a *generic* system.img
across different product configs. Moving the key to /product
partition to allow more product-specific AVB keys.

Device board config can add /product/etc/fstab.postinstall,
to mount system_other with this key in /product. It can specify
different mount options, file systems, verity settings, etc., in
this product-specific fstab as well.

Bug: 123611926
Test: `make productimage` checks the following is generated.
      $OUT/product/etc/security/avb/system_other.avbpubkey
      Also checks it's included in $OUT/installed-files-product.{json, txt}

Test: run the following command and checks that
      PRODUCT/etc/security/avb/system_other.avbpubkey is updated:
      ./build/tools/releasetools/sign_target_files_apks \
        --avb_system_other_algorithm SHA256_RSA2048 \
        --avb_system_other_key external/avb/test/data/testkey_rsa2048.pem \
        out/dist/*-target_files-*.zip signed-target_files.zip

Change-Id: I6804f29941bec54375d80bd68a5aedb5c23b842e
2019-03-20 16:18:11 +08:00
Colin Cross afa2b169f7 Merge "Add x86 AVX2 and AVX512 supported architectures" am: 88e38f01ba am: a31d29ffb6
am: 39e785ff4b

Change-Id: Ie9d066278ee87dd1a9a7309c998e59af0e252abd
2019-03-19 23:39:12 -07:00
Colin Cross 39e785ff4b Merge "Add x86 AVX2 and AVX512 supported architectures" am: 88e38f01ba
am: a31d29ffb6

Change-Id: I08d9073143c9eabb6adc6ebef00c2e3e2e450edb
2019-03-19 23:34:59 -07:00
Colin Cross a31d29ffb6 Merge "Add x86 AVX2 and AVX512 supported architectures"
am: 88e38f01ba

Change-Id: I79b7bf9f1a0992e27c1e6290c624d4c8545a5f8c
2019-03-19 23:30:50 -07:00
Colin Cross 88e38f01ba Merge "Add x86 AVX2 and AVX512 supported architectures" 2019-03-20 06:22:22 +00:00
Jiyong Park 808ff21cfb Merge "Add LOCAL_SOONG_SYMBOL_PATH" am: 995c632cdc am: 7478fc5a8a
am: d0155c4180

Change-Id: Ib4b1babf0e4215578f480563bb2b6fafd460b4bf
2019-03-19 21:36:55 -07:00
nelsonli b3abf9d4d2 Merge "Build: Ensuring test runtime dependencies are installed." am: 71ec795e47 am: 1d49779e2f
am: 5cac6f2ac2

Change-Id: I16a037e9a693f6cdbf6886e3445cf02e8e9a12c4
2019-03-19 21:29:02 -07:00
Jiyong Park d0155c4180 Merge "Add LOCAL_SOONG_SYMBOL_PATH" am: 995c632cdc
am: 7478fc5a8a

Change-Id: I11b2f45cf02700be7b6237c6b6355c998e828089
2019-03-19 21:24:01 -07:00
nelsonli 5cac6f2ac2 Merge "Build: Ensuring test runtime dependencies are installed." am: 71ec795e47
am: 1d49779e2f

Change-Id: I1dd93e3469f4ee366d9f641cbbca2a9f296c7230
2019-03-19 21:23:10 -07:00
Jiyong Park 7478fc5a8a Merge "Add LOCAL_SOONG_SYMBOL_PATH"
am: 995c632cdc

Change-Id: If2569a1e25eedab5f2bcc9ce572a222fc914c184
2019-03-19 21:17:41 -07:00
nelsonli 1d49779e2f Merge "Build: Ensuring test runtime dependencies are installed."
am: 71ec795e47

Change-Id: I8335bb5be06cb118a71d3673b7d6f0812a5432ff
2019-03-19 21:16:57 -07:00
Treehugger Robot 995c632cdc Merge "Add LOCAL_SOONG_SYMBOL_PATH" 2019-03-20 03:01:40 +00:00
Treehugger Robot 71ec795e47 Merge "Build: Ensuring test runtime dependencies are installed." 2019-03-20 01:17:17 +00:00
Jaewoong Jung 8c3d2e571e Merge "Split out app_prebuilt_internal.mk." am: 71638acad7 am: cd290b0804
am: 3182dce1c4

Change-Id: Ib097d659cdee9ed1bfc553097a9040336bba34ac
2019-03-19 18:15:25 -07:00
Jaewoong Jung 3182dce1c4 Merge "Split out app_prebuilt_internal.mk." am: 71638acad7
am: cd290b0804

Change-Id: Ia663707d5877a694e59a06e826e2f8c69448f29d
2019-03-19 18:03:11 -07:00
Jaewoong Jung cd290b0804 Merge "Split out app_prebuilt_internal.mk."
am: 71638acad7

Change-Id: I749f1c984c837d8838b243f37ea4c34cb6674cd2
2019-03-19 18:00:01 -07:00
Jaewoong Jung 71638acad7 Merge "Split out app_prebuilt_internal.mk." 2019-03-20 00:51:45 +00:00