Commit Graph

52344 Commits

Author SHA1 Message Date
Daniel Norman
d181c2119a Merge "Validates the config lists used by the script." am: a4ab1d8490
am: 0e58857364

Change-Id: I81e7dea7218e5281523d5fcf9cc33a7411b70312
2019-03-19 17:14:57 -07:00
Daniel Norman
0e58857364 Merge "Validates the config lists used by the script."
am: a4ab1d8490

Change-Id: I49846ae2cd3e66df79b8230363f916fa5c380f5a
2019-03-19 17:10:46 -07:00
Daniel Norman
a4ab1d8490 Merge "Validates the config lists used by the script." 2019-03-19 23:56:25 +00:00
Tao Bao
9782c5b49c Merge "releasetools: Allow skipping PRESIGNED APEXes." am: 2812fd32ac am: 7898831d95
am: 5e779eec7c

Change-Id: Ib2a9cc3e12198471ee891d6c0e81013c0302b82a
2019-03-19 16:46:59 -07:00
Tao Bao
5e779eec7c Merge "releasetools: Allow skipping PRESIGNED APEXes." am: 2812fd32ac
am: 7898831d95

Change-Id: I8a86cb272ee64603cb15afbe8e6146a9eaab94fa
2019-03-19 16:34:46 -07:00
Tao Bao
7898831d95 Merge "releasetools: Allow skipping PRESIGNED APEXes."
am: 2812fd32ac

Change-Id: I2586d1663b0625dee739f964116e8371d90fb813
2019-03-19 16:24:24 -07:00
Tao Bao
2812fd32ac Merge "releasetools: Allow skipping PRESIGNED APEXes." 2019-03-19 23:04:07 +00:00
Daniel Norman
2cc4a17ee6 Merge "Allow disabling building super partition for DAP devices" am: 1bc36fa328 am: 0aa34b44a1
am: 29631f22fe

Change-Id: Idfe38b760cfa68a06e3a548396463d5f4106e1b2
2019-03-19 15:41:35 -07:00
Daniel Norman
aa967cc673 Merge "Adds optional --rebuild_recovery flag to merge_target_files." am: fab3f29e5a am: 62f2c36d9a
am: 3e9a4b096e

Change-Id: Ie0f12dcefbadfab262f0c824665b9282aa0217be
2019-03-19 15:31:29 -07:00
Daniel Norman
29631f22fe Merge "Allow disabling building super partition for DAP devices" am: 1bc36fa328
am: 0aa34b44a1

Change-Id: Ic4c59f377983a4c990be21043510ab20adf52877
2019-03-19 15:29:15 -07:00
Daniel Norman
0aa34b44a1 Merge "Allow disabling building super partition for DAP devices"
am: 1bc36fa328

Change-Id: I674d188302fba37e8fdf2ca76554b9c9d7f9e0c8
2019-03-19 15:22:04 -07:00
Daniel Norman
1bc36fa328 Merge "Allow disabling building super partition for DAP devices" 2019-03-19 22:13:26 +00:00
Daniel Norman
3e9a4b096e Merge "Adds optional --rebuild_recovery flag to merge_target_files." am: fab3f29e5a
am: 62f2c36d9a

Change-Id: Ifde8cfb2c5e69350e54720ff8fca05c54dd9380b
2019-03-19 15:07:57 -07:00
Jiyong Park
a32f00e553 Add LOCAL_SOONG_SYMBOL_PATH
The soong-only variable is used to specify the location where the symbol
file is located. When unspecified, LOCAL_MODULE_PATH is used instead as
before.

This is needed when the path that a file is installed to is different
from the path that the file is accessed from at runtime. For example, if
TARGET_FLATTEN_APEX=true, a file lib/libX.so in an APEX com.android.foo
is installed to /system/apex/com.android.foo/lib/libX.so. However, it's
runtime path is /apex/com.android.foo/lib/libX.so as
/system/apex/com.android.foo is bind-mounted to /apex/com,android.foo.

Bug: 120846816
Test: m and inspect that symbol files exist under
$(PRODUCT_OUT)/symbols/apex/com.android.runtime/

Change-Id: I1b39f6e0cde115d442f14380c365796feff3437b
2019-03-20 06:56:20 +09:00
Daniel Norman
62f2c36d9a Merge "Adds optional --rebuild_recovery flag to merge_target_files."
am: fab3f29e5a

Change-Id: I834d2e7ed672dce20960dd5c97b57fe3dbdc3bb6
2019-03-19 14:52:17 -07:00
Daniel Norman
fab3f29e5a Merge "Adds optional --rebuild_recovery flag to merge_target_files." 2019-03-19 21:32:28 +00:00
Tao Bao
14b806debc Merge "Revert "releasetools: check_target_files_signatures.py checks APEXes."" am: a0debcb62f am: a08464f59d
am: b06dc4ea54

Change-Id: Iceb51beb117f391f4d5ba54756ffe2c36e52cd2a
2019-03-19 13:55:00 -07:00
Tao Bao
b06dc4ea54 Merge "Revert "releasetools: check_target_files_signatures.py checks APEXes."" am: a0debcb62f
am: a08464f59d

Change-Id: I498168bff3173cd62df92771335f58a3bc1d6ad0
2019-03-19 13:47:39 -07:00
Tao Bao
a08464f59d Merge "Revert "releasetools: check_target_files_signatures.py checks APEXes.""
am: a0debcb62f

Change-Id: Iffe70f3385d53e15e7fee3fdfa56dc5fb33aa4e6
2019-03-19 13:40:35 -07:00
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