Commit graph

48199 commits

Author SHA1 Message Date
Colin Cross
47e384c3d6 Remove dexpreopting of boot jars from Make
Dexpreopting of boot jars is now implemented in
build/soong/java/dexpreopt_bootjars.go.

Test: m checkbuild
Change-Id: I036510e7674b876976ce191c5b18bf0b7a15c6ee
2019-02-15 13:00:14 -08:00
Colin Cross
dba735e9a5 Merge "Fix resource overlay order for static libraries" 2019-02-15 18:54:49 +00:00
Treehugger Robot
611a99da84 Merge "Add libnpt back into system." 2019-02-15 16:59:40 +00:00
Martin Stjernholm
fd0b822d09 Add libnpt back into system.
It must be there for libjdwp to find it and load the debugger transport
correctly. This is a temporary fix while we are looking into loading libnpt
from the Runtime APEX.

Bug: 124498388
Test: adb forward tcp:5555 jdwp:`adb shell pidof com.android.email` && jdb -attach localhost:5555
Test: atest CtsJdwpTestCases
Change-Id: I644c092c2ad5f6c9669bdccc24c7953d3be6b328
2019-02-15 15:08:50 +00:00
Treehugger Robot
b41ab14b1e Merge "Fix booting problem on GSI with user build" 2019-02-15 10:37:44 +00:00
SzuWei Lin
fd6d294c2b Fix booting problem on GSI with user build
GSI doesn't include gsi_system.prop on user build, and cause some
devices cannot boot GSI with user build. Some properies in
gsi_system.prop do not suitable for user build, the patch create
a new gsi_system_user.prop for GSI user build.

Bug: 124479721
Test: boot aosp_arm64-user on a blueline device.
Change-Id: Ide2bdc8e8733817afb832b50b28807768e22f011
2019-02-15 14:34:53 +08:00
Remi NGUYEN VAN
fc35e5aaa5 Merge "Add test keys for networkstack" 2019-02-15 04:11:07 +00:00
Treehugger Robot
569478f046 Merge "Add missing hiddenapi product variables to Soong config" 2019-02-15 03:47:31 +00:00
Tom Cherry
506a796bd8 Merge "Error if $(TARGET_DEVICE_DIR)/android_filesystem_config.h exists" 2019-02-14 20:56:56 +00:00
Colin Cross
36f79c4be6 Add missing hiddenapi product variables to Soong config
If72bd1c20b2014d0a3d400624d37fdb0a3052245 failed to propagate
PRODUCT_HIDDENAPI_STUBS* to Soong.

Bug: 124316921
Test: m out/soong/hiddenapi/hiddenapi-flags.csv, check previously
      blacklisted classes are now whitelisted.

Change-Id: I9b4a364654bad77b38ceb7062dafaeeab5f49517
2019-02-14 11:22:02 -08:00
Treehugger Robot
da4ee462c7 Merge "Revert "Add APK container signing key/cert pairs for APEXes"" 2019-02-14 18:42:47 +00:00
Suren Baghdasaryan
e57df508c4 Merge "Add cgroups.recovery.json into recovery image" 2019-02-14 18:08:40 +00:00
Tom Cherry
1a9f8356fd Error if $(TARGET_DEVICE_DIR)/android_filesystem_config.h exists
This was deprecated along with TARGET_ANDROID_FILESYSTEM_CONFIG_H so
warn if it still exists.

Test: successful error if it exists, no error if it does not
Change-Id: I7dde3c88aaf7ecec23ffe018cbe8b42ebadb2bf8
2019-02-14 10:02:04 -08:00
Suren Baghdasaryan
72546076c8 Add cgroups.recovery.json into recovery image
Use cgroups.recovery.json as /etc/cgroups.json during recovery.

Bug: 124270406
Test: "adb reboot sideload; adb devices" shows 'sideload' as expected
Change-Id: I0af01a6801da7ce29ddd7c30ad48be4f98c3a280
Signed-off-by: Suren Baghdasaryan <surenb@google.com>
2019-02-14 17:08:55 +00:00
Jiyong Park
2237d06a78 Revert "Add APK container signing key/cert pairs for APEXes"
This reverts commit 74f27716f3.

The key/cert pairs for APEXes are moved to the same directory where the
APEXes are defined.

Test: Check this for all APEXes
jarsigner -verify -verbose -certs out/target/product/blueline/system/apex/com.android.tzdata.apex shows
...
X.509, CN=com.android.tzdata, OU=Android, O=Android, L=Mountain View, ST=California, C=US

Change-Id: I8d867b434b93aa68cbc707fa20ed8dbd4cef755e
2019-02-15 00:39:47 +09:00
Logan Chien
87ec538ef1 Merge "Strip LOCAL_CHECK_ELF_FILES" 2019-02-14 10:20:28 +00:00
Logan Chien
e87ff2d85f Strip LOCAL_CHECK_ELF_FILES
This commit strips LOCAL_CHECK_ELF_FILES before comparing it with
`false` so that developers can add comments after LOCAL_CHECK_ELF_FILES.
For example:

    LOCAL_CHECK_ELF_FILES := false  # disable checks due to ...

Bug: 119084334
Test: Add some spaces after LOCAL_CHECK_ELF_FILES and run
      CHECK_ELF_FILES=true make check-elf-files
Change-Id: I2bfaff4807aeeea6c7af0b9d7d716742b6764cd0
2019-02-14 14:30:09 +08:00
Treehugger Robot
6eeef21b9d Merge "Drop /root when installing symbols" 2019-02-14 05:27:44 +00:00
Treehugger Robot
07603d63f6 Merge "Generate API XML files from android stub targets instead of text input." 2019-02-14 05:19:34 +00:00
Colin Cross
b11fc29b13 Fix resource overlay order for static libraries
If a static library has static library dependencies then all resources
need to be moved to an overlay to maintain the correct ordering so
that a static library resource overlays the same resource in a
dependency.

Bug: 124108931
Test: m checkbuild
Change-Id: I6be9a80c53e6247a6589272ab0e653a9a0ded814
2019-02-14 03:34:57 +00:00
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
5aab10f40d Merge "Enable coverage only when LOCAL_SDK_VERSION > 23" 2019-02-14 00:05:57 +00: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
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
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
2582554c42 Merge "Move dump-products back to the config stage" 2019-02-13 09:12:30 +00:00
Treehugger Robot
95c7f58bb7 Merge "Add an option not to install all VNDK libs" 2019-02-13 07:30:58 +00: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
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
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
8bca10ade4 Merge "Remove TARGET_ANDROID_FILESYSTEM_CONFIG_H" 2019-02-12 21:10:41 +00: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
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