Baligh Uddin
23341af32b
Merge "Fix syntax error for SignApexFile"
...
am: bbf17e92e5
2019-12-04 13:08:46 -08:00
Treehugger Robot
bbf17e92e5
Merge "Fix syntax error for SignApexFile"
2019-12-04 21:03:02 +00:00
Automerger Merge Worker
11566c2ad2
Merge "Merge Android10 QPR1 into AOSP master" am: e16258ff5d am: 957356df1f
...
Change-Id: I65b47863c1ed506af151fe8f2c2e3b84a57bb6c4
2019-12-04 16:58:02 +00:00
Baligh Uddin
ac936fd573
Fix syntax error for SignApexFile
...
BUG: 145662097
TEST: Local smoke test which invokes sign_apex for local apex files.
2019-12-04 08:30:32 -08:00
Xin Li
957356df1f
Merge "Merge Android10 QPR1 into AOSP master" am: e16258ff5d
...
am: 96fbb5b8df
2019-12-04 08:07:36 -08:00
Yu-Han Yang
0903d11744
Merge "Add GNSS HAL v2.1 to vndk"
2019-12-04 00:52:24 +00:00
TreeHugger Robot
fa758bdc9f
Merge "Add permission APEX to base_system."
2019-12-04 00:21:01 +00:00
Xin Li
96fbb5b8df
Merge "Merge Android10 QPR1 into AOSP master"
...
am: e16258ff5d
2019-12-03 16:07:30 -08:00
Treehugger Robot
e16258ff5d
Merge "Merge Android10 QPR1 into AOSP master"
2019-12-03 23:15:06 +00:00
Automerger Merge Worker
d2e17fb7c7
Merge "Add rust_device_test_config_template.xml" am: c4fbb3a42d am: 23b8f54563
...
Change-Id: I5d8fcb72c9ed65a719821e9e9750706832c7998b
2019-12-03 21:44:43 +00:00
Chih-Hung Hsieh
23b8f54563
Merge "Add rust_device_test_config_template.xml" am: c4fbb3a42d
...
am: e10275046a
2019-12-03 13:32:29 -08:00
Chih-Hung Hsieh
e10275046a
Merge "Add rust_device_test_config_template.xml"
...
am: c4fbb3a42d
2019-12-03 13:28:32 -08:00
Treehugger Robot
c4fbb3a42d
Merge "Add rust_device_test_config_template.xml"
2019-12-03 21:19:12 +00:00
Automerger Merge Worker
7c85b3bebb
Merge "Add boot image locations to the module dexpreopt config." am: a5479b71e0 am: 87396ddd43
...
Change-Id: If491b491a5e1e15f48cbb4bbc29760d67018c86a
2019-12-03 17:41:19 +00:00
Robert Shih
fe60bc708c
Merge "gsi current.txt: add android.hardware.drm@1.3.so"
2019-12-03 17:33:03 +00:00
Automerger Merge Worker
8db9ab21dc
Merge "Add sdkext module" am: 5685159a7c am: 2e36b2a95d
...
Change-Id: Iedbe3897736a7e9c7b29a2ceb5ae3e7bc020f0b6
2019-12-03 17:08:46 +00:00
Ulyana Trafimovich
87396ddd43
Merge "Add boot image locations to the module dexpreopt config." am: a5479b71e0
...
am: f72a0ee27c
2019-12-03 08:55:04 -08:00
Ulyana Trafimovich
f72a0ee27c
Merge "Add boot image locations to the module dexpreopt config."
...
am: a5479b71e0
2019-12-03 08:46:42 -08:00
Anton Hansson
2e36b2a95d
Merge "Add sdkext module" am: 5685159a7c
...
am: c1bad39da1
2019-12-03 08:42:49 -08:00
Anton Hansson
c1bad39da1
Merge "Add sdkext module"
...
am: 5685159a7c
2019-12-03 08:29:14 -08:00
lesl
e373b78fb1
VDK: add android.hardware.wifi.hostapd@1.2.so
...
Bug: 142752869
Test: update-vndk-list.sh and Manual Test
Change-Id: If0a38d00953ea7daaca3eb0f668a7fa8082e9502
2019-12-03 23:36:12 +08:00
Ulyana Trafimovich
a5479b71e0
Merge "Add boot image locations to the module dexpreopt config."
2019-12-03 14:04:18 +00:00
Anton Hansson
5685159a7c
Merge "Add sdkext module"
2019-12-03 13:47:39 +00:00
Anton Hansson
c982aecdb1
Add sdkext module
...
Add the module to the build, and its jar to the bootclasspath.
Bug: 137191822
Test: m
Change-Id: I11700ac6da3fe031692b792d2975c5eec5414e09
2019-12-03 13:32:15 +00:00
Ulya Trafimovich
3ad6f5ebbf
Add boot image locations to the module dexpreopt config.
...
Multiple boot image locations should be passed to dex2oat after
splitting the boot image into primary ART image and the framework
boot image extension.
Test: m
Bug: b/119800099
Change-Id: Ide6dfed1d09a6c12aad6f1cc0d4af4fb2c63a6be
2019-12-03 10:27:26 +00:00
Xin Li
3fc4383f38
Merge Android10 QPR1 into AOSP master
...
Bug: 145570283
Change-Id: Ic9069d28533b22c5b820203c65fc1e404a47755f
2019-12-02 21:25:01 -08:00
Automerger Merge Worker
594da5d83a
Merge "base_system.mk: Align formatting for updatable boot jar variable" am: 78560b2049 am: e2b081d273
...
Change-Id: Ieb877eb916152ce3df46ed7cca98af1c565ec899
2019-12-03 00:59:19 +00:00
Automerger Merge Worker
bae2535347
Merge "Don't generate recovery patch for A/B systems." am: 43e5420a50 am: 036ae61e93
...
Change-Id: I544f51b0839b60c5d5d5d50bd1eeea7b9255a7c5
2019-12-03 00:58:37 +00:00
Roshan Pius
e2b081d273
Merge "base_system.mk: Align formatting for updatable boot jar variable" am: 78560b2049
...
am: 41e679308d
2019-12-02 16:50:04 -08:00
Bill Peckham
036ae61e93
Merge "Don't generate recovery patch for A/B systems." am: 43e5420a50
...
am: 0a17dc31f3
2019-12-02 16:47:57 -08:00
Roshan Pius
41e679308d
Merge "base_system.mk: Align formatting for updatable boot jar variable"
...
am: 78560b2049
2019-12-02 16:47:47 -08:00
Bill Peckham
0a17dc31f3
Merge "Don't generate recovery patch for A/B systems."
...
am: 43e5420a50
2019-12-02 16:45:58 -08:00
Roshan Pius
78560b2049
Merge "base_system.mk: Align formatting for updatable boot jar variable"
2019-12-03 00:43:17 +00:00
Bill Peckham
43e5420a50
Merge "Don't generate recovery patch for A/B systems."
2019-12-03 00:42:22 +00:00
Alistair Delva
ee1683e8e2
Merge "Allow f2fs sparse mode to be disabled" am: 1cfe41269f am: 7ad9383ad2
...
am: abab96fb77
2019-12-02 14:20:46 -08:00
Alistair Delva
abab96fb77
Merge "Allow f2fs sparse mode to be disabled" am: 1cfe41269f
...
am: 7ad9383ad2
2019-12-02 14:12:43 -08:00
Alistair Delva
7ad9383ad2
Merge "Allow f2fs sparse mode to be disabled"
...
am: 1cfe41269f
2019-12-02 14:06:40 -08:00
Alistair Delva
1cfe41269f
Merge "Allow f2fs sparse mode to be disabled"
2019-12-02 21:54:20 +00:00
Hai Zhang
ec5ca71550
Add permission APEX to base_system.
...
Bug: 136503238
Test: atest --rebuild-module-info permission_e2e_tests
Change-Id: Id2a01c2c4660627380c6f2b39eef800683502837
2019-12-02 11:53:06 -08:00
Bill Peckham
c0f413f0ad
Don't generate recovery patch for A/B systems.
...
An A/B system that has a recovery image should not generate the recovery patch.
This change gates the creation of the recovery patch such that we create it
only when the recovery image exists and only for non-A/B systems.
Test: Build A/B system, verify that recovery patch is not present.
Bug: 144104493
Change-Id: Ib570c21b73912c4e4b7a964b192abc15fde9a753
2019-12-02 18:16:01 +00:00
Chih-Hung Hsieh
0d51f2fe2f
Add rust_device_test_config_template.xml
...
* Derived from native_test_config_template.xml
Bug: 140938178
Test: make rust projects
Change-Id: I5bfeb0a578cb0fcf134eb9b524a6d3e5b6eeafcc
2019-12-02 17:44:47 +00:00
Mark Chien
6637766433
[automerger skipped] Merge "[Tether08] build InProcessTethering package" am: 05c8db112a am: d8c7549b22
...
am: 2fd7f8e2021542743b88
2019-11-30 04:36:15 -08:00
Mark Chien
2fd7f8e202
Merge "[Tether08] build InProcessTethering package" am: 05c8db112a
...
am: d8c7549b22
2019-11-30 04:31:14 -08:00
Mark Chien
d8c7549b22
Merge "[Tether08] build InProcessTethering package"
...
am: 05c8db112a
2019-11-30 04:25:26 -08:00
Mark Chien
05c8db112a
Merge "[Tether08] build InProcessTethering package"
2019-11-30 12:17:47 +00:00
Dan Shi
0820c97eec
Merge "Add vts-core-tradefed.jar to general-tests.zip" am: 06c957dde2 am: f9fd7aa810
...
am: aea6abf963
2019-11-29 21:00:38 -08:00
Dan Shi
aea6abf963
Merge "Add vts-core-tradefed.jar to general-tests.zip" am: 06c957dde2
...
am: f9fd7aa810
2019-11-29 20:56:22 -08:00
Dan Shi
f9fd7aa810
Merge "Add vts-core-tradefed.jar to general-tests.zip"
...
am: 06c957dde2
2019-11-29 20:52:22 -08:00
Dan Shi
06c957dde2
Merge "Add vts-core-tradefed.jar to general-tests.zip"
2019-11-30 04:47:54 +00:00
TreeHugger Robot
bd5470a63e
Merge "[Tether08] build InProcessTethering package"
2019-11-29 17:05:14 +00:00
