Steven Moreland
569f080bd4
Merge "vintf vibrator vndk" am: fcd0862632 am: 3c0a874fbf
...
am: aa614c7d59
2019-11-25 09:52:03 -08:00
Steven Moreland
aa614c7d59
Merge "vintf vibrator vndk" am: fcd0862632
...
am: 3c0a874fbf
2019-11-25 09:46:05 -08:00
Steven Moreland
3c0a874fbf
Merge "vintf vibrator vndk"
...
am: fcd0862632
2019-11-25 09:39:57 -08:00
Steven Moreland
fcd0862632
Merge "vintf vibrator vndk"
2019-11-25 17:31:26 +00:00
Ulya Trafimovich
3fb6a949a6
Do not dexpreopt system server jars from updatable modules.
...
Test: m
Test: The list of updatable system server jars is empty now,
so I tested that the filer works with a manual experiment:
- temporarily add wifi-service to PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS
- m nothing
- fgrep -e 'wifi-service dexpreopt' $ANDROID_BUILD_TOP/out/build-$TARGET_PRODUCT.ninja
- expect empty output (no dexpreopt command is generated)
Change-Id: Ia4206ccc263b535b6e39b54c6e8db28845ff2bf5
2019-11-25 16:36:52 +00:00
Xin Li
3005074420
[automerger skipped] Merge "Merge QQ1A.191205.011 into stage-aosp-master" into stage-aosp-master am: 8974b44505 -s ours
...
am: b3de727d95c68e033695
2019-11-25 08:03:41 -08:00
Xin Li
264b472520
[automerger skipped] Merge QQ1A.191205.011 into stage-aosp-master am: 8ad8d1bc6e -s ours
...
am: ff273d580dc68e033695
2019-11-25 07:49:53 -08:00
Steven Laver
67bcf129f5
Merge "releasetools: merge_target_files.py should handle new contents of dynamic_partitions_info.txt" am: 1567472ff9 am: 338f16c2df
...
am: 015686445c
2019-11-25 07:48:23 -08:00
Benedict Wong
1023921d76
Merge changes from topics "Create IPsec(IKE) APEX", "Expose IKE ID, TS & SaProposal" am: f81965bdc8 am: 97239f3c3e
...
am: 582fcc3ad2
2019-11-25 07:16:44 -08:00
Anton Hansson
c5ece221b2
Merge "Update references to service jars"
2019-11-25 13:15:57 +00:00
Xin Li
b3de727d95
[automerger skipped] Merge "Merge QQ1A.191205.011 into stage-aosp-master" into stage-aosp-master
...
am: 8974b44505c68e033695
2019-11-23 23:55:59 -08:00
Xin Li
ff273d580d
[automerger skipped] Merge QQ1A.191205.011 into stage-aosp-master
...
am: 8ad8d1bc6ec68e033695
2019-11-23 23:46:04 -08:00
TreeHugger Robot
8974b44505
Merge "Merge QQ1A.191205.011 into stage-aosp-master" into stage-aosp-master
2019-11-24 07:37:08 +00:00
Dan Shi
bafb1d7289
Add vts-core-tradefed.jar to general-tests.zip
...
This is needed for vts-core tests require vts specific preparers.
Bug: 142972256
Test: m -j general-tests
Change-Id: Ic2def11ac5f57a923d2bcefe6683e9a5fa66e7c6
2019-11-23 12:16:11 -08:00
Steven Laver
015686445c
Merge "releasetools: merge_target_files.py should handle new contents of dynamic_partitions_info.txt" am: 1567472ff9
...
am: 338f16c2df
2019-11-23 07:27:19 -08:00
Steven Laver
338f16c2df
Merge "releasetools: merge_target_files.py should handle new contents of dynamic_partitions_info.txt"
...
am: 1567472ff9
2019-11-23 07:24:49 -08:00
Treehugger Robot
1567472ff9
Merge "releasetools: merge_target_files.py should handle new contents of dynamic_partitions_info.txt"
2019-11-23 15:18:33 +00:00
Benedict Wong
582fcc3ad2
Merge changes from topics "Create IPsec(IKE) APEX", "Expose IKE ID, TS & SaProposal" am: f81965bdc8
...
am: 97239f3c3e
2019-11-22 20:18:30 -08:00
Benedict Wong
97239f3c3e
Merge changes from topics "Create IPsec(IKE) APEX", "Expose IKE ID, TS & SaProposal"
...
am: f81965bdc8
2019-11-22 20:10:09 -08:00
Benedict Wong
f81965bdc8
Merge changes from topics "Create IPsec(IKE) APEX", "Expose IKE ID, TS & SaProposal"
...
* changes:
Add ike.jar to bootclasspath to expose IKE API
Add com.android.ipsec APEX to base makefile
2019-11-23 03:45:53 +00:00
Roshan Pius
27367f05c2
Merge "base_system.mk: Support system_server jars from apexes" am: 9dda264619 am: 20cc65daed
...
am: b318e9931e
2019-11-22 19:21:07 -08:00
Roshan Pius
b318e9931e
Merge "base_system.mk: Support system_server jars from apexes" am: 9dda264619
...
am: 20cc65daed
2019-11-22 19:18:01 -08:00
Roshan Pius
20cc65daed
Merge "base_system.mk: Support system_server jars from apexes"
...
am: 9dda264619
2019-11-22 19:15:39 -08:00
Roshan Pius
9dda264619
Merge "base_system.mk: Support system_server jars from apexes"
2019-11-23 03:09:35 +00:00
Amit Mahajan
fd95b73781
Merge "Revert "Add TeleServiceLib along with TeleService to PRODUCT_PACKAGES.""
2019-11-23 01:33:18 +00:00
Amit Mahajan
be7f79e75f
Revert "Add TeleServiceLib along with TeleService to PRODUCT_PACKAGES."
...
This reverts commit 49afe97130
2019-11-23 01:23:51 +00:00
Xin Li
8ad8d1bc6e
Merge QQ1A.191205.011 into stage-aosp-master
...
Bug: 144955631
Merged-In: Ic7ee4e41d29762471fc5b25dce6e757858fd1ea9
Change-Id: Id6deffc7ce714a7ddf7855293cd0fb629724fdeb
2019-11-22 13:59:33 -08:00
Roshan Pius
d6e239fc35
base_system.mk: Support system_server jars from apexes
...
Allow system_server jars delivered via apex. Regular system_server
jars are located in /system/framework folder. But, jars delivered via
apex are mounted at /apex/<module_name>/javalib. Also, not all the
libraries in /apex/<module_name>/javalib will be a system_server jar,
so adding a mechanism to list out the jar file explicitly within the
apex module.
Bug: 144722612
Bug: 141785760
Test: Compiles (both with empty & non-empty PRODUCT_SYSTEM_SERVER_APEX_JARS
value set)
Change-Id: Ia181ab22fdf2da575bfd532c1cd90a2f54742528
2019-11-22 12:48:09 -08:00
Amit Mahajan
aef794f026
Merge "Add TeleServiceLib along with TeleService to PRODUCT_PACKAGES."
2019-11-22 20:28:13 +00:00
Amit Mahajan
49afe97130
Add TeleServiceLib along with TeleService to PRODUCT_PACKAGES.
...
Test: basic telephony sanity & atest TeleServiceTests
Bug: 144806641
Change-Id: Id1c1819321fa825151c3a4c505fa43dee37cb2d2
2019-11-22 20:27:25 +00:00
Xin Li
1a7b1dff22
[automerger skipped] DO NOT MERGE - Merge QQ1A.191003.001 into stage-aosp-master am: cde85ce1eb
...
am: 7612a2d676
2019-11-22 11:10:16 -08:00
Xin Li
7612a2d676
DO NOT MERGE - Merge QQ1A.191003.001 into stage-aosp-master
...
am: cde85ce1eb
2019-11-22 11:07:17 -08:00
Xin Li
cde85ce1eb
DO NOT MERGE - Merge QQ1A.191003.001 into stage-aosp-master
...
Bug: 144955631
Change-Id: I975a0b433b102ed580b70ff1cb83ad8c6ccdae45
2019-11-22 10:47:43 -08:00
Steven Laver
615385ee8b
releasetools: merge_target_files.py should handle new contents of dynamic_partitions_info.txt
...
With a recent change (cb8e2755ff
2019-11-22 09:34:27 -08:00
Anton Hansson
a2b816616c
Update references to service jars
...
These are being renamed to service-* instead of *-service.
Test: treehugger
Change-Id: Ib8af8ca8eafee7d466d2d3873461bbd9c91a686d
2019-11-22 12:15:32 +00:00
evitayan
8ac6463155
Add ike.jar to bootclasspath to expose IKE API
...
IKE will be a mainline module. This commit adds ike.jar to
bootpathclass so that IKE API is accessible to apps.
Bug: 143983419
Test: make update-api && make
Change-Id: I1dbb249f3109f45ce32c34bcb398108d61bc06cc
2019-11-21 16:21:14 -08:00
Jaewoong Jung
01be67bce9
Merge "Copy additional test apk outputs to suite dirs." am: 4a0832210c am: 18b0a0a072
...
am: c68e033695
2019-11-21 15:34:25 -08:00
Jaewoong Jung
c68e033695
Merge "Copy additional test apk outputs to suite dirs." am: 4a0832210c
...
am: 18b0a0a072
2019-11-21 15:30:17 -08:00
Jaewoong Jung
18b0a0a072
Merge "Copy additional test apk outputs to suite dirs."
...
am: 4a0832210c
2019-11-21 15:26:21 -08:00
Treehugger Robot
4a0832210c
Merge "Copy additional test apk outputs to suite dirs."
2019-11-21 23:20:16 +00:00
Shawn Willden
a92d893b7e
Merge "Add Keymaster 4.1" am: 394d65b41e am: e18ddbbf82
...
am: e7003e9f8d
2019-11-21 15:01:44 -08:00
Shawn Willden
e7003e9f8d
Merge "Add Keymaster 4.1" am: 394d65b41e
...
am: e18ddbbf82
2019-11-21 14:57:33 -08:00
Shawn Willden
e18ddbbf82
Merge "Add Keymaster 4.1"
...
am: 394d65b41e
2019-11-21 14:53:43 -08:00
Terry Wang
05b1ea74e7
Merge "Add a new system service for app search management."
2019-11-21 22:43:07 +00:00
Treehugger Robot
394d65b41e
Merge "Add Keymaster 4.1"
2019-11-21 22:41:49 +00:00
Yifan Hong
c38a70d2c9
Merge "releasetools: fix avbtool arguments." am: bdb8090522 am: cf98e3f512
...
am: 0aa817b41b
2019-11-21 13:25:21 -08:00
Yifan Hong
0aa817b41b
Merge "releasetools: fix avbtool arguments." am: bdb8090522
...
am: cf98e3f512
2019-11-21 13:20:43 -08:00
Yifan Hong
cf98e3f512
Merge "releasetools: fix avbtool arguments."
...
am: bdb8090522
2019-11-21 13:17:43 -08:00
Yifan Hong
bdb8090522
Merge "releasetools: fix avbtool arguments."
2019-11-21 20:52:55 +00:00
TreeHugger Robot
52569158cd
Merge "gralloc: add libgralloctypes.so to VNDK-SP"
2019-11-21 20:41:22 +00:00
