Commit Graph

48704 Commits

Author SHA1 Message Date
Colin Cross
a78af927a9 Merge "Fix resource overlay order for static libraries"
am: dba735e9a5

Change-Id: Ibeb88897c5b532fb4c3cb2935641fe555f05dc46
2019-02-15 11:10:36 -08:00
Colin Cross
dba735e9a5 Merge "Fix resource overlay order for static libraries" 2019-02-15 18:54:49 +00:00
Martin Stjernholm
1ebf81e58f Merge "Add libnpt back into system."
am: 611a99da84

Change-Id: If347ab98059c53a090cbed7cbc6e717cf1268057
2019-02-15 09:11:15 -08: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
SzuWei Lin
3e985e9b10 Merge "Fix booting problem on GSI with user build"
am: b41ab14b1e

Change-Id: I5502ef27c48600144af42a5972dce3efd864efb2
2019-02-15 02:47:11 -08: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
661bfd4405 Merge "Add test keys for networkstack"
am: fc35e5aaa5

Change-Id: Ie01719da0a859140f78275f407e2f9c1a874f1ec
2019-02-14 20:21:15 -08:00
Remi NGUYEN VAN
fc35e5aaa5 Merge "Add test keys for networkstack" 2019-02-15 04:11:07 +00:00
Colin Cross
3b6b01b04a Merge "Add missing hiddenapi product variables to Soong config"
am: 569478f046

Change-Id: I0c9cd744aeb06aa87b87631b636362cd069eca18
2019-02-14 20:05:11 -08:00
Treehugger Robot
569478f046 Merge "Add missing hiddenapi product variables to Soong config" 2019-02-15 03:47:31 +00:00
Xin Li
673fa32bc7 Merge "DO NOT MERGE - Merge pi-platform-release (PPRL.190205.001) into stage-aosp-master" into stage-aosp-master 2019-02-14 22:11:35 +00:00
Tom Cherry
201f5e5a3c Merge "Error if $(TARGET_DEVICE_DIR)/android_filesystem_config.h exists"
am: 506a796bd8

Change-Id: I17a17b6184b3e0cd2ddfb43728d8cfc5014aa985
2019-02-14 13:07:07 -08: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
Jiyong Park
5f501b5127 Merge "Revert "Add APK container signing key/cert pairs for APEXes""
am: da4ee462c7

Change-Id: I1196220903d59ab7e7a3972e8475cf1a7317b168
2019-02-14 10:55:46 -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
70072e97eb Merge "Add cgroups.recovery.json into recovery image"
am: e57df508c4

Change-Id: I9a9e4ea7cfc22af97facbd359f2e2a72ec55a19f
2019-02-14 10:19:49 -08: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
08b81a84e1 Merge "Strip LOCAL_CHECK_ELF_FILES"
am: 87ec538ef1

Change-Id: I158d1818ebed209118a9703d939cc40e179d2b27
2019-02-14 02:30:41 -08: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
Jiyong Park
4840c913b3 Merge "Drop /root when installing symbols"
am: 6eeef21b9d

Change-Id: I1026d4c952d703043e8ddb18329bdf849069cfe9
2019-02-13 21:33:51 -08:00
Allen Hair
7de1297db3 Merge "Generate API XML files from android stub targets instead of text input."
am: 07603d63f6

Change-Id: Ib6afcfa98f28f31529c24acf1b2acbf19f328a9f
2019-02-13 21:32:39 -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
Tom Cherry
cff9af302b Merge "Fix failing test_fs_config_generator.py tests"
am: f83ba4e8b1

Change-Id: I70fc52b006407fc749057b74c2599eac2e4c5392
2019-02-13 20:30:13 -08:00
Yifan Hong
b97fa33969 Merge "DAP: system_as_root can't be true."
am: bee89836c7

Change-Id: I37b164da2f9171413090032976aebf71de04a5a5
2019-02-13 20:25:43 -08:00
Logan Chien
8cf536529c Merge changes I2f2a7df5,I84ff9f61
am: e083c26a19

Change-Id: I49b1cb979a4d5940054ae0fd7250e84d898d78cd
2019-02-13 20:14:36 -08: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
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