Jiyong Park
fdc5c8439b
Merge "Revert "Add APK container signing key/cert pairs for APEXes"" am: da4ee462c7
...
am: 5f501b5127
Change-Id: Id71d78e7fe3c242baf0d4097e52450e603888a6a
2019-02-14 11:04:48 -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
244ed1f4e3
Merge "Add cgroups.recovery.json into recovery image" am: e57df508c4
...
am: 70072e97eb
Change-Id: I01971c05871d9a4ae0f24794fe90babc693cad07
2019-02-14 10:24:04 -08: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
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
9eb337b2d7
Merge "Strip LOCAL_CHECK_ELF_FILES" am: 87ec538ef1
...
am: 08b81a84e1
Change-Id: I7cfa59c796f4708ea81c970d57e749be2b489f30
2019-02-14 02:34:51 -08: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
ecc465cd3c
Merge "Drop /root when installing symbols" am: 6eeef21b9d
...
am: 4840c913b3
Change-Id: I4b655b22bf1b5d7bfaad051186a260262ca2b0d3
2019-02-13 21:47:27 -08:00
Allen Hair
8dd24c9337
Merge "Generate API XML files from android stub targets instead of text input." am: 07603d63f6
...
am: 7de1297db3
Change-Id: Ia96cdfa6d6f12d92c749c136adfac85370fb10a4
2019-02-13 21:46:22 -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
43fa4a9985
Merge "Fix failing test_fs_config_generator.py tests" am: f83ba4e8b1
...
am: cff9af302b
Change-Id: Idde025803213c7f952e326065647ae41d1b8350b
2019-02-13 20:58:38 -08:00
Yifan Hong
99576a5d38
Merge "DAP: system_as_root can't be true." am: bee89836c7
...
am: b97fa33969
Change-Id: Ic016a1fb624f9bb2048c2759d542a4f45ba1b3f5
2019-02-13 20:32:22 -08:00
Logan Chien
4129464c5c
Merge changes I2f2a7df5,I84ff9f61 am: e083c26a19
...
am: 8cf536529c
Change-Id: I21c85998565610e3473948144fdf157a7082b829
2019-02-13 20:31:27 -08: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
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
80381f8a06
Merge "Enable coverage only when LOCAL_SDK_VERSION > 23" am: 5aab10f40d
...
am: f5119676e9
Change-Id: I5b9d563e8656da3137ae9749aaf45ffae6ac9de5
2019-02-13 16:44:54 -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
Colin Cross
da37ee584c
Merge "Make copy-many-files take an optional destination directory" am: ceaf716a3d
...
am: e95dc4e3cc
Change-Id: Idc0fee93d1f37ab74ca29fcccc9268140e9c3639
2019-02-13 16:10:16 -08:00
Martin Stjernholm
689a580f8d
Merge "Disable installation of ART modules in /system." am: 6747fb91bb
...
am: 49305909a8
Change-Id: I71cc9e6d4adc58e5b00011daf37086387ab2be5b
2019-02-13 16:08:17 -08:00
Pirama Arumuga Nainar
5aab10f40d
Merge "Enable coverage only when LOCAL_SDK_VERSION > 23"
2019-02-14 00:05:57 +00:00
Bill Peckham
36b230c394
Merge "Skip some build steps if not building system image." am: 4a3c68bffa
...
am: 8a4041a18e
Change-Id: I17249226965c48c599da4a6f932e4d63b0c7a5d0
2019-02-13 15:59:50 -08: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
89527442c9
Merge "Code improvement to adjusted the blocks size for care_map file" am: b8ac90803c
...
am: 9cdba9ba97
Change-Id: I67efdb6a6c8e186c706b35f0dc4984d2bafc7c99
2019-02-13 12:24:07 -08: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
7b66ef4a57
Merge "Revert "Revert "Never strip and store dex files uncompressed when they are preopted on system.""" am: cd75414f1e
...
am: 3ac7c3e373
Change-Id: I9e38c739277b4bcd31c13d2e24e45586790201f2
2019-02-13 04:14:42 -08:00