Commit Graph

52075 Commits

Author SHA1 Message Date
Jaewoong Jung
09bfe55bd6 Split out app_prebuilt_internal.mk.
This is part of prebuilt_internal.mk refactoring work and also a
preliminary task to design and implement its Soong counterpart.

Test: built and flashed an image for a Pixel device + TreeHugger
Change-Id: I89b13b1e0a2780b02fda7ee888e73052ac1abd9c
2019-03-19 13:35:23 -07:00
Tao Bao
a0debcb62f Merge "Revert "releasetools: check_target_files_signatures.py checks APEXes."" 2019-03-19 20:25:50 +00:00
Jared Lim
b378d4d0a5 Merge "Generate api.xml for every target build." am: 22b9a4a207 am: 823e08eea4
am: 74475f02e7

Change-Id: I26be66bbab1cb72927f9b2e62a60d057a7fccb6d
2019-03-19 12:38:38 -07:00
Jared Lim
74475f02e7 Merge "Generate api.xml for every target build." am: 22b9a4a207
am: 823e08eea4

Change-Id: I28e4d85eb5c74ef8996b740d01e0a9c9763eb38d
2019-03-19 12:34:26 -07:00
Jared Lim
823e08eea4 Merge "Generate api.xml for every target build."
am: 22b9a4a207

Change-Id: I9751cb5a72b32e4ba1c6b0ca87dfd7695ee0e107
2019-03-19 12:30:15 -07:00
Tao Bao
e134399cab releasetools: Allow skipping PRESIGNED APEXes.
This CL adds support that allows treating an APEX as pre-signed. We can
skip signing an APEX with `-e <apex-name>=` and
`--extra_apex_payload_key <apex-name>=`. Note that the payload_key and
container_key must be in consistent state - either they're both
PRESIGNED or none of them is. CheckApkAndApexKeysAvailable() has been
updated to perform the sanity check.

Bug: 123716522
Test: Run sign_target_files_apks.py with the above flags.
Test: python -m unittest test_sign_target_files_apks
Change-Id: Id1e2f3f2facd4a97a385983cc9b78c028f7e7e73
2019-03-19 12:25:02 -07:00
Treehugger Robot
22b9a4a207 Merge "Generate api.xml for every target build." 2019-03-19 19:18:16 +00:00
Anton Hansson
fa7ddae29b Fix missing modules check for dont_bother goals
Like If1f817d855cbe329b83caee9fdd68c2cce55f02b, but for
PRODUCT_PACKAGES, which is only enabled for a few builds.

Also share the ALLOW_MISSING_DEPENDENCIES check with the host
version.

Test: m product-graph
Change-Id: Iab55072e7d7c0fc9f4680cc515e139a5214dc3b4
2019-03-19 18:20:30 +00:00
Daniel Norman
e596452f03 Validates the config lists used by the script.
This validation is to help ensure that any usage of custom merge config
files does not accidentally exclude any item that has been added to the
default config lists.

Bug: 124197349
Test: Run merge_target_files with custom merge config files.
Change-Id: I34c51cb75212368146a2944d37621f311060d24d
2019-03-19 17:47:49 +00:00
Tao Bao
5516d37f41 Revert "releasetools: check_target_files_signatures.py checks APEXes."
This reverts commit d8469727bc. The script
is broken on target_files.zip that don't contain any APEX.

Bug: 128848294
Test: Run check_target_files_signatures.py on target_files.zip w/o APEX.
2019-03-19 09:30:08 -07:00
Tao Bao
a9dc04e78e Merge "releasetools: Kill the use of os.getenv('AVBTOOL')." am: e3f9dc6113 am: 26541cd427
am: 52c4db2511

Change-Id: I382906c7b245f34a59ef5d59c6797256b2e485b2
2019-03-19 09:13:30 -07:00
Tao Bao
52c4db2511 Merge "releasetools: Kill the use of os.getenv('AVBTOOL')." am: e3f9dc6113
am: 26541cd427

Change-Id: I8a0fc55c0f44cb4d028e3dc7a39645280341a0d5
2019-03-19 09:09:19 -07:00
Tao Bao
26541cd427 Merge "releasetools: Kill the use of os.getenv('AVBTOOL')."
am: e3f9dc6113

Change-Id: I31c769d45d049a0867aed3db84790fb8b2db1c6d
2019-03-19 09:05:09 -07:00
Tao Bao
e3f9dc6113 Merge "releasetools: Kill the use of os.getenv('AVBTOOL')." 2019-03-19 15:53:26 +00:00
Logan Chien
98af3cf0ea Merge "Fix check_elf_file with LOCAL_SDK_VERSION and NDK libs" am: ab28c2d4ef am: 9e7d8b77a4
am: d5cbb5eba3

Change-Id: I4d00444d8af19f5ab6a1800a79d4ede457a157ed
2019-03-19 02:30:53 -07:00
Logan Chien
d5cbb5eba3 Merge "Fix check_elf_file with LOCAL_SDK_VERSION and NDK libs" am: ab28c2d4ef
am: 9e7d8b77a4

Change-Id: I7936a84b3ec41760739707fc54b89424489f0ed8
2019-03-19 02:26:34 -07:00
Logan Chien
9e7d8b77a4 Merge "Fix check_elf_file with LOCAL_SDK_VERSION and NDK libs"
am: ab28c2d4ef

Change-Id: I90ef9805a09710c9ced9775f4aab2a3b869a83aa
2019-03-19 02:22:25 -07:00
Logan Chien
ab28c2d4ef Merge "Fix check_elf_file with LOCAL_SDK_VERSION and NDK libs" 2019-03-19 09:09:50 +00:00
nelsonli
fe04351f6f Build: Ensuring test runtime dependencies are installed.
After migrating the primary install location of test modules into a
    generic testcase folder. All test modules will install to
    out/target/product/<product>/testcase/<module_name>/ if they don't
    specify their LOCAL_MODULE_PATH.
    But the dependent test module should also be copied to testcase
    folder even its LOCAL_MODULE_PATH be set.

BUG: 128815093
Test: 1. vi cts/tests/signature/api-check/Android.mk
        add LOCAL_MODULE_PATH for cts-hiddenapi_flags-csv
      2. m CtsHiddenApiBlacklistDebugClassTestCases
         Then, hiddenapi_flags.csv should also be copied to testcase
	 folder.

Change-Id: Iff872447348e74b2728e0913d04e46ccbaa4e972
2019-03-19 08:12:20 +00:00
Jared Lim
361e4439d0 Generate api.xml for every target build.
Test: make dist DIST_DIR=out/dist

Change-Id: I8cf7290c8a3757110761e9c852339b841c5d1748
2019-03-18 22:42:07 -07:00
Colin Cross
f1f2fdb2b6 Merge "Add a dependency on boot jars $(LOCAL_BUILT_MODULE)" am: c2144bb0c4 am: f9953860b0
am: 1d3caff3c0

Change-Id: If62196568ce29e96aca19e4e3f43005c2c554487
2019-03-18 22:24:09 -07:00
Bowgo Tsai
c1c511a195 Merge "Sets default value of ro.postinstall.fstab.prefix" am: b6520ddcf1 am: cf4ee6ac23
am: c42b681fca

Change-Id: I4ad8a50fd4bcce3b8b6c1f0c75f764eb3dd3c241
2019-03-18 22:22:20 -07:00
Colin Cross
1d3caff3c0 Merge "Add a dependency on boot jars $(LOCAL_BUILT_MODULE)" am: c2144bb0c4
am: f9953860b0

Change-Id: I73d64e79268603d4c0088c6e4225a830e0e04a8f
2019-03-18 22:19:44 -07:00
Bowgo Tsai
c42b681fca Merge "Sets default value of ro.postinstall.fstab.prefix" am: b6520ddcf1
am: cf4ee6ac23

Change-Id: I940adcc68419e660ba27294a7b4f8a2f6e299074
2019-03-18 22:18:10 -07:00
Colin Cross
f9953860b0 Merge "Add a dependency on boot jars $(LOCAL_BUILT_MODULE)"
am: c2144bb0c4

Change-Id: I670fb51e3bc4f859c9716bad277dd09d8c5e3806
2019-03-18 22:15:24 -07:00
Bowgo Tsai
cf4ee6ac23 Merge "Sets default value of ro.postinstall.fstab.prefix"
am: b6520ddcf1

Change-Id: I0ec7a2b917b8bf227b68ef1c58d307a1c5328170
2019-03-18 22:14:00 -07:00
Treehugger Robot
c2144bb0c4 Merge "Add a dependency on boot jars $(LOCAL_BUILT_MODULE)" 2019-03-19 05:08:26 +00:00
Treehugger Robot
b6520ddcf1 Merge "Sets default value of ro.postinstall.fstab.prefix" 2019-03-19 05:02:58 +00:00
Tao Bao
f88e0ce01d releasetools: Kill the use of os.getenv('AVBTOOL').
OTA tools should pick up the avbtool, as listed in dict['avb_avbtool'],
from the current PATH (plus bin/ under the dir specified via `--path`),
the same way as handling all other host tools.

Test: `m dist`
Change-Id: I3eb4d2c61979b03d9c23b2403d9a38cf052d87ea
2019-03-18 21:01:43 -07:00
Yifan Hong
45a05bc545 Merge "Add supernod build target." am: 691defc4bd am: 5aec484888
am: 2725896bce

Change-Id: I5b83bc2af99d65c43660b3b764c3f7b5f2a0471a
2019-03-18 18:01:46 -07:00
Yifan Hong
2725896bce Merge "Add supernod build target." am: 691defc4bd
am: 5aec484888

Change-Id: Ifd1d3ed4c30cb83ab6aec0a3f7f52806c39743bd
2019-03-18 17:47:14 -07:00
Yifan Hong
5aec484888 Merge "Add supernod build target."
am: 691defc4bd

Change-Id: I5716c6a8028bb6c7beaf2ecbdd6ea28e44ad07ec
2019-03-18 17:06:47 -07:00
Yifan Hong
691defc4bd Merge "Add supernod build target." 2019-03-18 23:46:05 +00:00
Tao Bao
7f0951757e Merge "releasetools: Fix an issue when using APEX container key mapping." am: 7cd870ed60 am: f9a68d8167
am: 0891df1563

Change-Id: Id1edceb9e3666d325af602aad20206cf1937596f
2019-03-18 14:52:13 -07:00
Tao Bao
0891df1563 Merge "releasetools: Fix an issue when using APEX container key mapping." am: 7cd870ed60
am: f9a68d8167

Change-Id: I5ca4a4fc836ee9f25c4f8bcf02275000e08d77ca
2019-03-18 14:38:59 -07:00
Tao Bao
f9a68d8167 Merge "releasetools: Fix an issue when using APEX container key mapping."
am: 7cd870ed60

Change-Id: I3124312baf6f3e40a00f8c2bb079fa3155197828
2019-03-18 14:34:51 -07:00
Tao Bao
7cd870ed60 Merge "releasetools: Fix an issue when using APEX container key mapping." 2019-03-18 21:28:46 +00:00
Colin Cross
3ecb9c4fdd Add a dependency on boot jars $(LOCAL_BUILT_MODULE)
After I25163e91886cea6941afa25cdb529ed053278dcb there is no longer
a dependency on $(LOCAL_BUILT_MODULE) for boot jars, as boot.art
is installed instead.  Add a dependency from boot.art to
$(LOCAL_BUILT_MODULE) so that $(LOCAL_BUILT_MODULE) and its
dependencies (which may include jacoco-report-classes.jar) is
copied for every build.

Fixes: 127702563
Test: forrest
Change-Id: I4db2d1f5fe2e1141fe93317cd7a2a58a33f8fbff
2019-03-18 13:17:22 -07:00
Anton Hansson
dc017122fb Read product/device RRO dirs separately from soong
This change splits the LOCAL_SOONG_RRO_DIRS into two,
representing RRO dirs that originated from device and
product overlay configs, respectively.

Also plumb the device/product configs in separately.

Bug: 127758779
Test: verify noop on presubmit targets
Change-Id: Iddee1b4d7303b7ecaeced91216ea82fe29123770
2019-03-18 19:39:51 +00:00
Daniel Norman
a4911da57d Adds optional --rebuild_recovery flag to merge_target_files.
Also makes AddSystem check that an output_zip exists before attempting
to add the recovery patch to the output zip.

Bug: 128838154
Test: Running merge_target_files with --rebuild_recovery and verifying
it passes --rebuild_recovery to add_img_to_target_files.
Change-Id: I19347b2c0dabf29b7196045b18551b5d0687df2c
2019-03-18 12:29:31 -07:00
Yifan Hong
889b1f7c0c Allow disabling building super partition for DAP devices
Previously:
if (DAP && !BUILD_SUPER) error;

Now:
if (BUILD_SUPER && !DAP) error;

This allows DAP devices to disable building super partition when the OEM
doesn't want to. The ability to build super partition shouldn't be
a requirement of enabling DAP; rather, building super partition requires
DAP to be enabled.

To do this on a device, PRODUCT_BUILD_SUPER_PARTITION should be set
to false explicitly. If it is unset, it will use the value of
PRODUCT_USE_DYNAMIC_PARTITIONS.

Bug: 127687287
Test: set PRODUCT_BUILD_SUPER_PARTITION to false and build dist

Change-Id: I25f1866e61d73affb445c1aec042cf53aac93583
2019-03-18 11:48:03 -07:00
Chih-hung Hsieh
ca4f099cba Merge "Remove redundant per-file *" am: e7854a3745 am: 2f6a69ef5b
am: 9d883220d3

Change-Id: I32da9bbbed5858448ca40ac2b5b69619c8480f29
2019-03-18 11:07:41 -07:00
Chih-hung Hsieh
9d883220d3 Merge "Remove redundant per-file *" am: e7854a3745
am: 2f6a69ef5b

Change-Id: I88d542373e74f1af39e9ea2cf3e59e3e96c44244
2019-03-18 11:03:25 -07:00
Chih-hung Hsieh
2f6a69ef5b Merge "Remove redundant per-file *"
am: e7854a3745

Change-Id: I055704f0b9eb183a9914ff6f5f326bdbbc94b834
2019-03-18 10:59:57 -07:00
Chih-hung Hsieh
e7854a3745 Merge "Remove redundant per-file *" 2019-03-18 17:36:49 +00:00
Tao Bao
fa9de0aae8 releasetools: Fix an issue when using APEX container key mapping.
The keys_info in the touched code is a tuple, which is immutable.

Bug: 123716522
Test: Run sign_target_files_apks.py with '-e foo.apex=bar' that replaces
      the APEX container key.

Change-Id: I4e57e46c93a56b7f6646764d021ebb42c19bf7f5
2019-03-18 10:26:09 -07:00
Chih-Hung Hsieh
648129394f Remove redundant per-file *
Now per-file inherits global owners by default.

Bug: 128838191
Test: upload validator and [FIND OWNERS]
Change-Id: I58fb3cc8f2f277a5aa4b3372734197d888e59bcc
2019-03-18 10:21:15 -07:00
Anton Hansson
08231e1786 Refactor generate_enforce_rro
A few tweaks to make it easier to extend to generating RROs in
multiple partitions:
- deduce the module name inside generate_enforce_rro
- dedup rule definition
- tweak framework-res check to use source module name instead

Bug: 127758779
Test: verify noop on presubmit targets
Change-Id: I2f0d6270b21f5427c372c04a5c6e7fb712e72a9a
2019-03-18 14:21:09 +00:00
SzuWei Lin
b3ba5843f2 Merge "Disable RescueParty in GSI temporary" am: 39f88f9c28 am: b9bf035c60
am: ff91a64d85

Change-Id: Ic120b0cb84de828548772f59712ee680f31aa73d
2019-03-18 04:27:41 -07:00
SzuWei Lin
ff91a64d85 Merge "Disable RescueParty in GSI temporary" am: 39f88f9c28
am: b9bf035c60

Change-Id: I0421201be1d31533f55b6ef252c34d7a2b0e6734
2019-03-18 04:23:31 -07:00