Commit Graph

48773 Commits

Author SHA1 Message Date
Tom Cherry f83ba4e8b1 Merge "Fix failing test_fs_config_generator.py tests" 2019-02-14 02:18:11 +00:00
Treehugger Robot bee89836c7 Merge "DAP: system_as_root can't be true." 2019-02-14 02:09:20 +00:00
Logan Chien e083c26a19 Merge changes I2f2a7df5,I84ff9f61
* changes:
  Check ELF files in both paths
  Add system shared libs to a prebuilt_internal.mk path
2019-02-14 01:53:27 +00:00
Allen Hair 191f0e5b60 Generate API XML files from android stub targets instead of text input.
The resulting XMLs will contain more complete information (such as
whether or not a method is native) than is available in current.txt.

Bug: 124335876
Test: make PRODUCT-cf_x86_phone-userdebug showcommands dist EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true SKIP_BOOT_JARS_CHECK=true tests

Change-Id: Icb8999bcd6be28f3ec8ff6bffa33b261f0d20606
2019-02-13 17:48:00 -08:00
Pirama Arumuga Nainar f5119676e9 Merge "Enable coverage only when LOCAL_SDK_VERSION > 23"
am: 5aab10f40d

Change-Id: Icd16e3925dfe4605aac91840dc094f5eb26afdae
2019-02-13 16:25:33 -08:00
Pirama Arumuga Nainar 5aab10f40d Merge "Enable coverage only when LOCAL_SDK_VERSION > 23" 2019-02-14 00:05:57 +00:00
Colin Cross e95dc4e3cc Merge "Make copy-many-files take an optional destination directory"
am: ceaf716a3d

Change-Id: I980f01aebab53ce670dff9f1080c0d9c85d895d4
2019-02-13 15:52:04 -08:00
Martin Stjernholm 49305909a8 Merge "Disable installation of ART modules in /system."
am: 6747fb91bb

Change-Id: I0dd463952899afbe421e99529e7cb3c421ecd61c
2019-02-13 15:16:09 -08:00
Bill Peckham 8a4041a18e Merge "Skip some build steps if not building system image."
am: 4a3c68bffa

Change-Id: I8f54ec1dd481867714b9af1b537d00504f821bc8
2019-02-13 15:15:21 -08:00
Colin Cross ceaf716a3d Merge "Make copy-many-files take an optional destination directory" 2019-02-13 23:11:38 +00:00
Yifan Hong f84c7e5c8f DAP: system_as_root can't be true.
Test: builds
Change-Id: I3e47e9717c983703494abc8417526caf5955d2e4
Fixes: 124274480
2019-02-13 15:08:33 -08:00
Treehugger Robot 6747fb91bb Merge "Disable installation of ART modules in /system." 2019-02-13 23:08:01 +00:00
Bill Peckham 4a3c68bffa Merge "Skip some build steps if not building system image." 2019-02-13 22:57:35 +00:00
Bill Peckham cc57de3256 Skip some build steps if not building system image.
tools/releasetools/add_img_to_target_files.py: This patch excludes the
inclusion of the system path into the target files if it does not exist (which
it will not if we are not building the system image).

Bug: 123430711
Test: Disable building system image, verify that target files builds without system.
Change-Id: Iaf964ede2b1df5ea4e004b572fd91187a366e75e
2019-02-13 22:57:14 +00:00
Tom Cherry 766adc9cbc Fix failing test_fs_config_generator.py tests
Also run pylint and yapf to fix the style issues.

Test: these same tests
Change-Id: I0a783f7a6f08a90f615d94e9d16da0f314b7813f
2019-02-13 14:34:42 -08:00
Martin Stjernholm a568592f53 Disable installation of ART modules in /system.
Remove ART modules (`art-runtime`, `art-tools`) from `PRODUCT_PACKAGES`, as
they are provided by the Android Runtime APEX module
(`com.android.runtime`).

Copy of rpl's http://r.android.com/812674.

Test: Flash and boot
Test: atest CtsJniTestCases
Test: atest CtsJdwpTestCases
Test: m checkbuild dist
Bug: 113373927
Change-Id: I3e0c130f1a9c596629ab243648f0251cf71c1499
2019-02-13 22:28:09 +00:00
Tianjie Xu 9cdba9ba97 Merge "Code improvement to adjusted the blocks size for care_map file"
am: b8ac90803c

Change-Id: I0655a9a76996aac812c738ee62b9d1fdfda4eea9
2019-02-13 12:15:47 -08:00
Tianjie Xu b8ac90803c Merge "Code improvement to adjusted the blocks size for care_map file" 2019-02-13 19:49:48 +00:00
Shashikant Baviskar 16a73897c3 Code improvement to adjusted the blocks size for care_map file
Bug: 123931528
Test: python -m unittest test_add_img_to_target_files
Change-Id: I589bc9681bccfa07588cab94f53f69d637d6f0f9
2019-02-13 18:34:50 +00:00
Colin Cross dc53f450af Make copy-many-files take an optional destination directory
Test: m checkbuild
Change-Id: I777952d27bd1a0cf2608e080a0f46e39268784ce
2019-02-13 08:03:25 -08:00
Nicolas Geoffray 3ac7c3e373 Merge "Revert "Revert "Never strip and store dex files uncompressed when they are preopted on system."""
am: cd75414f1e

Change-Id: Ie2582c55e4f4cf2304ce3edc97345530c1b58190
2019-02-13 04:10:14 -08:00
Nicolas Geoffray cd75414f1e Merge "Revert "Revert "Never strip and store dex files uncompressed when they are preopted on system.""" 2019-02-13 11:59:39 +00:00
Anton Hansson b893eaed97 Merge "Move dump-products back to the config stage"
am: 2582554c42

Change-Id: I2e836577b19ed8e055b3c951a9eb001d551622a2
2019-02-13 01:22:26 -08:00
Anton Hansson 2582554c42 Merge "Move dump-products back to the config stage" 2019-02-13 09:12:30 +00:00
Bowgo Tsai 45db7cefb3 Support verifying system_other
This commit extracts the AVB key used to sign system_other.img into
system.img, for init to verify system_other's AVB metadata.

The extracted key will locate in:
    /system/etc/security/avb/system_other.avbpubkey

Bug: 123611926
Test: build and checks the following is generated
      $OUT/system/etc/security/avb/system_other.avbpubkey

Change-Id: Icdc703ff5a0d50f8140bb652507b9b4cbc8a2118
2019-02-13 17:00:49 +08:00
Justin Yun 3385d3f2ff Merge "Add an option not to install all VNDK libs"
am: 95c7f58bb7

Change-Id: I8f08f7c9bca79b5c27551000e5c13ae295330fcc
2019-02-12 23:38:30 -08:00
Treehugger Robot 95c7f58bb7 Merge "Add an option not to install all VNDK libs" 2019-02-13 07:30:58 +00:00
Dan Willemsen df2ed6bf67 Merge "Support loading only approved vendorsetup.sh files"
am: 9f814c284f

Change-Id: I306f870d58efc0f134b88552020ed963fd8ca929
2019-02-12 20:53:09 -08:00
Treehugger Robot 9f814c284f Merge "Support loading only approved vendorsetup.sh files" 2019-02-13 04:19:38 +00:00
Justin Yun 89443aed80 Add an option not to install all VNDK libs
When using VNDK snapshot, current VNDK libs are not required. Use
"TARGET_SKIP_CURRENT_VNDK=true" to skip installing current VNDK libs.

Bug: 123607022
Test: TARGET_SKIP_CURRENT_VNDK=true PRODUCT_EXTRA_VNDK_VERSIONS=28 m -j
Change-Id: I65c902c71a7952536bbf824a1dccb9360e843f1a
2019-02-13 10:46:10 +09:00
Colin Cross 5755b02cfe Merge "Move dexpreopt image selection out of dexpreopt_gen"
am: 8f4e0f2939

Change-Id: I55321f2af249bf5a7c2c644b7dc6408439be3ecd
2019-02-12 17:15:31 -08:00
Colin Cross 8f4e0f2939 Merge "Move dexpreopt image selection out of dexpreopt_gen" 2019-02-13 01:00:49 +00:00
Dan Willemsen d855a72ebe Support loading only approved vendorsetup.sh files
Very few vendorsetup.sh files are needed anymore, since add_lunch_combo
has been deprecated. So add a way so that only approved vendorsetup.sh
files can be loaded into the shell, and others will be skipped.

This further limits the amount of code that can run outside the build
sandbox, and makes this list more visible to tree maintainers before
they're used instead of after.

Test: no allowed-vendorsetup_sh-files
Test: empty allowed-vendorsetup_sh-files
Test: one file in allowed-vendorsetup_sh-files
Test: two files in allowed-vendorsetup_sh-files
Test: non-present file in allowed-vendorsetup_sh-files
Change-Id: Ia23d1c9d11a7295d5be5abd10cf56edbdec80483
2019-02-12 15:52:36 -08:00
Bowgo Tsai e0b388d5ba Merge "Adding per-partition SPL into AVB prop descriptors"
am: cb52058f8f

Change-Id: Ifec9cc5738bf7d332ecd93daf71bacc490b6acb3
2019-02-12 15:44:28 -08:00
Dan Willemsen cff18343d4 Merge "Obsolete add_lunch_combo"
am: 5afd3dc00e

Change-Id: I45bb8cf046a18e9211598b748e69dbd6c7c87768
2019-02-12 15:37:54 -08:00
Treehugger Robot cb52058f8f Merge "Adding per-partition SPL into AVB prop descriptors" 2019-02-12 23:30:13 +00:00
Treehugger Robot 5afd3dc00e Merge "Obsolete add_lunch_combo" 2019-02-12 23:22:50 +00:00
Tom Cherry 1e29059140 Merge "Remove TARGET_ANDROID_FILESYSTEM_CONFIG_H"
am: 8bca10ade4

Change-Id: I625be2b79204b8938a54cef2143f2dd761d73c40
2019-02-12 13:31:44 -08:00
Tom Cherry 8bca10ade4 Merge "Remove TARGET_ANDROID_FILESYSTEM_CONFIG_H" 2019-02-12 21:10:41 +00:00
Xin Li 798d2a795e DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master
Bug: 124234733
Change-Id: Iade9f985e598b9c83746c8250eb88831626c9da5
2019-02-12 10:12:55 -08:00
Steven Laver 4225bbcbbe Merge "Allow properties to be derived from partition-specific properties"
am: 0cf76f544b

Change-Id: Ie0bb9a05c19be7736454589f8101d1608c6a434c
2019-02-12 08:52:08 -08:00
Steven Laver 0cf76f544b Merge "Allow properties to be derived from partition-specific properties" 2019-02-12 16:44:57 +00:00
Remi NGUYEN VAN 333c98517b Add test keys for networkstack
The networkstack is using shared test keys for NetworkStack.apk,
CaptivePortalLogin.apk and NetworkStackPermissionStub.apk.

This allows NetworkStackPermissionStub.apk to define signature
permissions without the platform certificate, and enforce that the other
packages match the signature to use the permissions if they are
installed.

Bug: 124033493
Test: m
Change-Id: I7257a472d702e82acdadffc4e0535c63a8bd591d
2019-02-13 00:57:41 +09:00
Nicolas Geoffray 98f5e86660 Revert "Revert "Never strip and store dex files uncompressed when they are preopted on system.""
This reverts commit a81dad1bc4.

Test: build && atest android.text.cts.EmojiTest#testEmojiGlyphWebView on Cuttlefish
Change-Id: Ie3c43830fc9a994ed35883abb8ca71d97bd5c44d
2019-02-12 14:00:38 +00:00
Jiyong Park cd3825adc7 Merge "TARGET_FLATTEN_APEX for GSI"
am: 84f1ade63f

Change-Id: If45249e72680a416453ed28853748df9d55e66ce
2019-02-12 00:14:58 -08:00
Jiyong Park 84f1ade63f Merge "TARGET_FLATTEN_APEX for GSI" 2019-02-12 08:04:39 +00:00
Dan Willemsen 5436c7e583 Obsolete add_lunch_combo
Bug: 77599627
Test: source build/envsetup.sh with add_lunch_combo calls in bash & zsh
Change-Id: If12b41d8f9a2f56efdb64ad0dccc25a1e342fdd1
2019-02-11 21:36:25 -08:00
Jim Tang b3fda301c2 Add Asuite prebuilds in PATH and remove functions.
Remove atest/acloud/aidegen functions and append prebuilt path
in PATH. Use local built by default; if there is no local built,
use the prebuilt one instead.

Bug:

Test: $ source build/envsetup.sh; lunch
      $ echo $PATH|sed 's/:/\n/g' | egrep "out|asuite"
      # will see out/host prioritises prebuilts/asuite.

Change-Id: I1e5869bcb81cf7058cf8971f480a47d2c8f8b6f0
2019-02-12 11:29:28 +08:00
Jeongik Cha 39fa5c4357 Merge "Detect shareduid between different partitions"
am: 1b082c3e05

Change-Id: Ib9ccfd4d63aa306d64f800498a1d14ebcf3654f0
2019-02-11 17:11:43 -08:00
Treehugger Robot 1b082c3e05 Merge "Detect shareduid between different partitions" 2019-02-12 00:55:08 +00:00