Commit graph

58368 commits

Author SHA1 Message Date
Sungsoo Lim
96504cfeb5 Remove media command
Use media-session shell command instead.

Bug: 144453231
Test: manually
Change-Id: I69e877d25621d4f77f40a676d1511cbb9e6af83d
2019-12-16 11:17:26 +09:00
TreeHugger Robot
5c0aa1b3ee Merge "Add vintf-common" 2019-12-15 08:40:32 +00:00
Automerger Merge Worker
5947d4ca60 Merge "Write list of copy headers" am: 6fe297fcc5 am: 3830d8ae0d am: 265572c081
Change-Id: Ifdd109d043b8a3ded7f1b51d45cb85ea08399201
2019-12-15 00:33:14 +00:00
Automerger Merge Worker
265572c081 Merge "Write list of copy headers" am: 6fe297fcc5 am: 3830d8ae0d
Change-Id: I97e8e66e6fd747066014296cb63b0b7758991e2e
2019-12-15 00:21:15 +00:00
Dan Willemsen
3830d8ae0d Merge "Write list of copy headers"
am: 6fe297fcc5

Change-Id: Ib2b5e2daa17ba392264edd44c03a6c0e8a16b69d
2019-12-14 16:08:06 -08:00
Dan Willemsen
6fe297fcc5 Merge "Write list of copy headers" 2019-12-15 00:04:15 +00:00
Pawin Vongmasa
d118131588 Add vintf-common
Test: Builds

Bug: 145839204
Change-Id: I9f28643d6fd70183f0d6778f0eb1290643400164
2019-12-14 01:50:19 -08:00
Dan Willemsen
79a0caff35 Write list of copy headers
So that soong_ui can remove obsolete headers that have been removed.

Test: cat out/target/product/crosshatch/.copied_headers_list
Test: cat out/target/product/generic/.copied_headers_list
Change-Id: I7df8029c1f2ed630d35c357f94e5dfb668e5824f
2019-12-13 19:35:05 -08:00
Automerger Merge Worker
4cf33dec6c Merge "Initialize common_proguard_flags for each module" am: 793147469e am: 25ed10e122 am: b25e28e3c9
Change-Id: I5d1ead8dd6738f9211c2a449b2ab3777ef28eb32
2019-12-14 03:26:39 +00:00
Automerger Merge Worker
b25e28e3c9 Merge "Initialize common_proguard_flags for each module" am: 793147469e am: 25ed10e122
Change-Id: I91c606cf7191ddc0974b1bf1583880cc099a393e
2019-12-14 03:15:55 +00:00
TreeHugger Robot
3dcbd4d1ca Merge "Remove Soong intermediates after renaming core variant" 2019-12-14 02:57:37 +00:00
Colin Cross
25ed10e122 Merge "Initialize common_proguard_flags for each module"
am: 793147469e

Change-Id: Ib88a684a67ecc89927c0593fe97e85028bfbcbf7
2019-12-13 18:55:38 -08:00
Treehugger Robot
793147469e Merge "Initialize common_proguard_flags for each module" 2019-12-14 02:52:59 +00:00
Colin Cross
2a40672597 Initialize common_proguard_flags for each module
Id938aa35e87c9c69769a3184dfea06fd02299688 removed the initial
assignment to common_proguard_flags, which both makes it grow as
each module is parsed and also turns it into a lazily evaluated
variable.  That causes the flags passed to R8 to be the flags
computed for the current module multiplied by the number of previously
parsed modules.

Fixes: 146150575
Test: m checkbuild
Change-Id: I87c9625496f482896be6867124f2f12ff662cd57
2019-12-13 16:23:11 -08:00
Automerger Merge Worker
5917af3f2a Merge "Revert "Remove ro.apex.updatable=false in GSI"" am: 565bb632c7 am: 6d349fe4cc am: 4f1b16f6aa
Change-Id: I9dc657daee47d7c89b763a8672d83fe5980def34
2019-12-14 00:21:27 +00:00
Automerger Merge Worker
4f1b16f6aa Merge "Revert "Remove ro.apex.updatable=false in GSI"" am: 565bb632c7 am: 6d349fe4cc
Change-Id: I0331be1cf5112d10a5defba3d138a0e99c35bbb9
2019-12-14 00:09:07 +00:00
SzuWei Lin
6d349fe4cc Merge "Revert "Remove ro.apex.updatable=false in GSI""
am: 565bb632c7

Change-Id: Ib5f8d0db7d709384aba2be23f785974a637dd82d
2019-12-13 15:58:42 -08:00
Automerger Merge Worker
c0b7c96add [automerger skipped] Merge "Make AOSP master use AOSP.MASTER as BUILD_ID." am: ed7d5f12e3 am: c6e5429a53 -s ours am: 3adc6575cf -s ours
am skip reason: Change-Id I1d718255fc30b255fc83ac79233ec440074084c4 with SHA-1 b5144d4c59 is in history

Change-Id: I36680b5a4e62e760299c7cefb289fd14bb245820
2019-12-13 23:36:49 +00:00
Automerger Merge Worker
3adc6575cf [automerger skipped] Merge "Make AOSP master use AOSP.MASTER as BUILD_ID." am: ed7d5f12e3 am: c6e5429a53 -s ours
am skip reason: Change-Id I1d718255fc30b255fc83ac79233ec440074084c4 with SHA-1 b5144d4c59 is in history

Change-Id: Idcf5b5ee893fb5a08a44b0326efacd674506a81a
2019-12-13 23:22:27 +00:00
Treehugger Robot
565bb632c7 Merge "Revert "Remove ro.apex.updatable=false in GSI"" 2019-12-13 23:15:51 +00:00
Xin Li
c6e5429a53 Merge "Make AOSP master use AOSP.MASTER as BUILD_ID."
am: ed7d5f12e3

Change-Id: I19cffa65f42c92e1b39622e736257230c711182d
2019-12-13 15:00:10 -08:00
Automerger Merge Worker
da7556550f Merge "sign_target_apks: Add networkstack to default key_map" am: d6aa90ce9a am: d9055ab8ab am: 31a06d3b93
Change-Id: Id62e8b986d5259cfe39af3e70d912a5e7870f060
2019-12-13 22:54:28 +00:00
Treehugger Robot
ed7d5f12e3 Merge "Make AOSP master use AOSP.MASTER as BUILD_ID." 2019-12-13 22:49:08 +00:00
Automerger Merge Worker
31a06d3b93 Merge "sign_target_apks: Add networkstack to default key_map" am: d6aa90ce9a am: d9055ab8ab
Change-Id: I0b368f7794dec38cdcefe551e2e011b84327a76b
2019-12-13 22:43:09 +00:00
Oleh Cherpak
d9055ab8ab Merge "sign_target_apks: Add networkstack to default key_map"
am: d6aa90ce9a

Change-Id: Ie9b37436b0d0c1d581a54a66455f71b617cc3e32
2019-12-13 14:30:03 -08:00
Treehugger Robot
d6aa90ce9a Merge "sign_target_apks: Add networkstack to default key_map" 2019-12-13 22:22:08 +00:00
Automerger Merge Worker
edf413c451 Merge changes from topic "gsi-with-flattened-apexes" am: b3bff1d203 am: 66ee21cedd am: 5feb2e79a3
Change-Id: I244be08d252e1da0eee055a451d748cf0cabca87
2019-12-13 22:13:49 +00:00
Automerger Merge Worker
5feb2e79a3 Merge changes from topic "gsi-with-flattened-apexes" am: b3bff1d203 am: 66ee21cedd
Change-Id: I5a1c446abab9e0e8dec7dca027bc757f8b34d14b
2019-12-13 21:56:16 +00:00
Dario Freni
66ee21cedd Merge changes from topic "gsi-with-flattened-apexes"
am: b3bff1d203

Change-Id: I08a6027d8b8ceb5466f6c295ea4cd0c2af89a21b
2019-12-13 13:35:05 -08:00
Treehugger Robot
b3bff1d203 Merge changes from topic "gsi-with-flattened-apexes"
* changes:
  Enable updatable-apex.mk for mainline_system
  Add PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES
2019-12-13 21:10:56 +00:00
TreeHugger Robot
7fdf27e437 Merge "Move service-statsd to updatable system server jar" 2019-12-13 19:48:39 +00:00
Automerger Merge Worker
fcabec6ec3 Merge "Add AFTL relevant options to OPTIONS in common.py." am: 9088392b6b am: f70dac0fc9 am: ab87bb98f9
Change-Id: I833d0e977d4e95eb9924e090af74437ab22cc5aa
2019-12-13 06:44:10 +00:00
Automerger Merge Worker
3fd96b0078 Merge "Add mainline_system_x86_64 product" am: 078b1598ff am: c47de5cb83 am: 8afcfa3877
Change-Id: I4edfa098ba8ed707e04bab5d93e6b0fed8217a43
2019-12-13 06:43:17 +00:00
Automerger Merge Worker
ab87bb98f9 Merge "Add AFTL relevant options to OPTIONS in common.py." am: 9088392b6b am: f70dac0fc9
Change-Id: I50d07afc2b0e28819711624a6ddde852c4542ab1
2019-12-13 06:26:04 +00:00
Automerger Merge Worker
8afcfa3877 Merge "Add mainline_system_x86_64 product" am: 078b1598ff am: c47de5cb83
Change-Id: Ic138d068d98da417b6bc808e579b5741307600c4
2019-12-13 06:25:03 +00:00
Dan Austin
f70dac0fc9 Merge "Add AFTL relevant options to OPTIONS in common.py."
am: 9088392b6b

Change-Id: Ie61676023965423d631b3ac5725e5d1f8a9910ea
2019-12-12 22:08:58 -08:00
Yo Chiang
c47de5cb83 Merge "Add mainline_system_x86_64 product"
am: 078b1598ff

Change-Id: I1a072bac757bb60a1f2221c59fc61f8c9a650526
2019-12-12 22:07:30 -08:00
Treehugger Robot
9088392b6b Merge "Add AFTL relevant options to OPTIONS in common.py." 2019-12-13 05:54:58 +00:00
Yo Chiang
078b1598ff Merge "Add mainline_system_x86_64 product" 2019-12-13 05:22:15 +00:00
Automerger Merge Worker
2dd3133345 Merge "Adding developer_gsi_keys.mk" am: dad976ffcb am: c58307824a am: 6686dfe7d9
Change-Id: I9fa93c25a636e60304deeb9284fa4e908cd41adb
2019-12-13 03:59:54 +00:00
Automerger Merge Worker
6686dfe7d9 Merge "Adding developer_gsi_keys.mk" am: dad976ffcb am: c58307824a
Change-Id: Ic2d30adc0868990bce0d417d7c3557e5334ba7f5
2019-12-13 03:41:03 +00:00
Bowgo Tsai
c58307824a Merge "Adding developer_gsi_keys.mk"
am: dad976ffcb

Change-Id: I88fe10b2c23cdaa9b301ed100b35893d27509bf8
2019-12-12 19:19:52 -08:00
Treehugger Robot
dad976ffcb Merge "Adding developer_gsi_keys.mk" 2019-12-13 03:13:02 +00:00
Automerger Merge Worker
b525412cc2 Merge "Add linkerconfig to recovery" am: 0542582560 am: 3701950613 am: b960782c52
Change-Id: I73bbd7ae770d51a75d3c63ed5877d00c4ad3c795
2019-12-13 02:38:23 +00:00
Automerger Merge Worker
b960782c52 Merge "Add linkerconfig to recovery" am: 0542582560 am: 3701950613
Change-Id: If0bf79bfe405a6db525fb9eb3de0bf44caad5b0b
2019-12-13 01:59:36 +00:00
Kiyoung Kim
3701950613 Merge "Add linkerconfig to recovery"
am: 0542582560

Change-Id: I289d6441bf7ae15291d881ef12dd4686a841edee
2019-12-12 17:13:52 -08:00
Kiyoung Kim
0542582560 Merge "Add linkerconfig to recovery" 2019-12-13 01:09:58 +00:00
Dan Austin
5290364e9b Add AFTL relevant options to OPTIONS in common.py.
Adds AFTL relevant options in preparation for avbtool changes. The
options are:
aftl_server: A string representing the URL of the transparency log.
aftl_key_path: The path to the public key associated with the
transparency log (in PEM format).
aftl_manufacturer_key_path: The path to the key associated with the
manufacturer for AFTL message signing.
aftl_signing_helper: The signing helper for use with AFTL message
signing.

Change-Id: I73d466f24b171c16dbdaa40c589779bed52be551
Test: Ran add_img_to_target_files with all AFTL options.
Bug: 138779249
2019-12-12 15:48:52 -08:00
Tej Singh
e9403e4e79 Move service-statsd to updatable system server jar
This moves StatsCompanionService into the statsd apex.
service-statsd.jar is no longer installed to system/framework, and is
instead installed to
/apex/com.android.os.statsd/javalib/service-statsd.jar by moving it from
PRODUCT_SYSTEM_SERVER_JARS to PRODUCT_UPDATABLE_SYSTEM_SERVER_JARS

Bug: 145923413
Test: make clean; make; vendor/google/tools/flashall and manual
inspection of jar locations
Test: made trivial update to SCS and bumped the version of the apex.
Then did: 1. make com.android.os.statsd 2. adb install
com.android.os.statsd 3. adb reboot. Verified that the change was
reflected via the apex update

Change-Id: Ia261ea79b2a46a4cc709e1b7dd072de15e17571e
2019-12-12 15:23:59 -08:00
Nicholas Ambur
76211be490 Merge "Add SoundTrigger@2.3 to gsi" 2019-12-12 21:37:00 +00:00