Nicolas Geoffray
4353c93116
Merge "Preopt: Pass -Xbootclasspath: arg to dex2oat." am: 9ce12752dc
am: 90406e61f1
...
am: 01c2b6b4aa
Change-Id: Ifc305f5b9905ae9f71347a1ab92e8a1504dc12fd
2019-01-09 04:59:38 -08:00
Nicolas Geoffray
01c2b6b4aa
Merge "Preopt: Pass -Xbootclasspath: arg to dex2oat." am: 9ce12752dc
...
am: 90406e61f1
Change-Id: I7205b689e5db2a5454ab6756a069e0ec4fb7ecb6
2019-01-09 04:55:38 -08:00
Nicolas Geoffray
90406e61f1
Merge "Preopt: Pass -Xbootclasspath: arg to dex2oat."
...
am: 9ce12752dc
Change-Id: I0ef7cb66d82208c1cef201cca9fb7941856f1cbb
2019-01-09 04:50:14 -08:00
Nicolas Geoffray
9ce12752dc
Merge "Preopt: Pass -Xbootclasspath: arg to dex2oat."
2019-01-09 12:37:15 +00:00
Jiyong Park
185d41e84d
Add PRODUCT_MANIFEST_PACKAGE_NAME_OVERRIDES
...
It is a list of <module_name>:<manifest_name> pairs. When the module
name of an APK or an APEX matches with <module_name>, then its app
manifest name is overridden to <manifest_name>.
<module_name> and <manifest_name> can be patterns as in
com.android.%:com.mycompany.android.%.release
Test: m with PRODUCT_MANIFEST_PACKAGE_NAME_OVERRIDES for
1) an APK in Android.mk
2) an APK in ANdroid.bp
3) an APEX
and check that manifest names are modified as specified
Change-Id: Ic09e059ea7b7ea99a50a1cf423a25aa587ef4466
2019-01-09 21:08:10 +09:00
Anton Hansson
df547b918a
Merge "Fix qemu image definition conditionals" am: fe9f373e10
am: 97b5c90219
...
am: b7ad7ff7d5
Change-Id: I37cbce61388fefd4db59da2b86adcee1dd29495b
2019-01-09 02:57:43 -08:00
Anton Hansson
b7ad7ff7d5
Merge "Fix qemu image definition conditionals" am: fe9f373e10
...
am: 97b5c90219
Change-Id: I5fdae9207bfccf2388407f87ffb80e3b186f856d
2019-01-09 02:52:07 -08:00
Anton Hansson
97b5c90219
Merge "Fix qemu image definition conditionals"
...
am: fe9f373e10
Change-Id: I42b147285923627b8afaab9580660fa330ba12cc
2019-01-09 02:46:09 -08:00
Anton Hansson
fe9f373e10
Merge "Fix qemu image definition conditionals"
2019-01-09 10:33:51 +00:00
SzuWei Lin
9d71661ea4
Merge "Refactor GSI BoardConfig.mk" am: 104904bdf0
am: eec9c48a6a
...
am: 8110b534f8
Change-Id: Ic1981c1cfeb172cd439b2b01be18fb3c0d532fc5
2019-01-08 22:29:14 -08:00
SzuWei Lin
8110b534f8
Merge "Refactor GSI BoardConfig.mk" am: 104904bdf0
...
am: eec9c48a6a
Change-Id: I66a7160fc53e54e71f483e8b6bb1664f48dac7e8
2019-01-08 22:25:01 -08:00
SzuWei Lin
eec9c48a6a
Merge "Refactor GSI BoardConfig.mk"
...
am: 104904bdf0
Change-Id: I791f55102507b0717c9389b2943d4ad3c77adb46
2019-01-08 22:19:53 -08:00
Treehugger Robot
104904bdf0
Merge "Refactor GSI BoardConfig.mk"
2019-01-09 06:05:41 +00:00
Thomas Joseph Avila
6083089f7a
set BUILD_ID=PI
...
Bug: 122310206
2019-01-08 15:36:57 -08:00
Android Build Merger (Role)
ed56062889
[automerger] [DO NOT MERGE] Update Platform Security String to 2019-03-01 for nyc-dev Bug:122541777 am: 7a403979d6
am: e56e5efec9
am: 87877d530a
am: 33ecfffc1f
skipped: 440db90921
...
Change-Id: I01f14495a15278d3e4a9b753be3c323eb596f24e
2019-01-08 22:45:33 +00:00
Android Build Merger (Role)
440db90921
[automerger] [DO NOT MERGE] Update Platform Security String to 2019-03-01 for nyc-dev Bug:122541777 am: 7a403979d6
am: e56e5efec9
am: 87877d530a
am: 33ecfffc1f
...
Change-Id: I4268b17fbd7e064dd5c1a77048ef238ce2eb3075
2019-01-08 22:45:32 +00:00
Android Build Merger (Role)
33ecfffc1f
[automerger] [DO NOT MERGE] Update Platform Security String to 2019-03-01 for nyc-dev Bug:122541777 am: 7a403979d6
am: e56e5efec9
am: 87877d530a
...
Change-Id: Ic4324df9733bd6dec37aad0f2218c0a7a4fe6dc5
2019-01-08 22:45:30 +00:00
Android Build Merger (Role)
87877d530a
[automerger] [DO NOT MERGE] Update Platform Security String to 2019-03-01 for nyc-dev Bug:122541777 am: 7a403979d6
am: e56e5efec9
...
Change-Id: Ic9d5eacd39787d9365523b1cea2c7c49b2eb88bc
2019-01-08 22:45:28 +00:00
Android Build Merger (Role)
e56e5efec9
[automerger] [DO NOT MERGE] Update Platform Security String to 2019-03-01 for nyc-dev Bug:122541777 am: 7a403979d6
...
Change-Id: I56938b60fddafa46970e6a45fffc48cbcd34434d
2019-01-08 22:45:27 +00:00
Adam Seaton
7a403979d6
[DO NOT MERGE] Update Platform Security String to 2019-03-01 for nyc-dev Bug:122541777
2019-01-08 22:45:25 +00:00
Adam Seaton
ac6eac206d
Update Platform Security String to 2019-03-05 for pi-dev Bug:122541777
2019-01-08 14:29:43 -08:00
Adam Seaton
a1165c3723
Update Platform Security String to 2019-03-01 for pi-dev
...
Bug:122541777
2019-01-08 13:59:01 -08:00
Benjamin Schwartz
7e566e21f0
[automerger skipped] Merge "Add android.hardware.power.stats@1.0 to current.txt" am: 1a3c9f26d1
am: b0bc076050
...
am: c14540aa67
-s ours
am skip reason: change_id I3c7263c83ab7b245205a21c7c503e8fe43a23de7 with SHA1 72bbe36216
is in history
Change-Id: I920c749a4ff1d0f02cb4bff64be4e867482d26a8
2019-01-08 10:29:48 -08:00
Benjamin Schwartz
c14540aa67
Merge "Add android.hardware.power.stats@1.0 to current.txt" am: 1a3c9f26d1
...
am: b0bc076050
Change-Id: I57f63816adbabbc6d21fbd8ed1b8c770d80f5a7d
2019-01-08 10:21:30 -08:00
Benjamin Schwartz
b0bc076050
Merge "Add android.hardware.power.stats@1.0 to current.txt"
...
am: 1a3c9f26d1
Change-Id: I509cbf8c9181930bc9006d731129fbcad4bf50cb
2019-01-08 10:07:11 -08:00
Benjamin Schwartz
1a3c9f26d1
Merge "Add android.hardware.power.stats@1.0 to current.txt"
2019-01-08 17:58:59 +00:00
Anton Hansson
1d97d64265
[automerger skipped] Merge "Move overridden AOSP modules out of *_system mks" am: 0909191b82
am: 595f0f174e
...
am: 6119296208
-s ours
am skip reason: change_id If658e6b4565924cd915a183400c5b2b32984eca4 with SHA1 746bcc91cf
is in history
Change-Id: Ic3f12718bc622bd2dee9dccf4bb1d19a834a93c9
2019-01-08 08:42:21 -08:00
Anton Hansson
6119296208
Merge "Move overridden AOSP modules out of *_system mks" am: 0909191b82
...
am: 595f0f174e
Change-Id: I678883da5800123c80ffbed33eccb1c467eecf10
2019-01-08 08:37:13 -08:00
Anton Hansson
595f0f174e
Merge "Move overridden AOSP modules out of *_system mks"
...
am: 0909191b82
Change-Id: I19cb5ce23285ef8ad14f6ed5bde83b64dee12fe5
2019-01-08 08:29:06 -08:00
Anton Hansson
0909191b82
Merge "Move overridden AOSP modules out of *_system mks"
2019-01-08 16:20:47 +00:00
Anton Hansson
dced84f9ec
Merge "Move overridden AOSP modules out of *_system mks"
2019-01-08 12:54:10 +00:00
Anton Hansson
0fed3cf513
Merge "Add adb_keys to mainline_system if they exist" am: 3a4a966507
am: 83d2837f4b
...
am: 01193c8f4c
Change-Id: Ib392eca3ff1627b96ed6a7ce138abad07d418e8c
2019-01-08 04:14:05 -08:00
Anton Hansson
14ef5cc4da
Merge "Add mainline.mk" am: 64bf2593f0
am: 082a87e4dc
...
am: a39232ae43
Change-Id: Id13049c87d2457b2587e9aae236d39446b4ef335
2019-01-08 04:12:19 -08:00
Anton Hansson
01193c8f4c
Merge "Add adb_keys to mainline_system if they exist" am: 3a4a966507
...
am: 83d2837f4b
Change-Id: I6440dfbfcc1f5a8b296128c1e3497f15ca05a033
2019-01-08 03:59:50 -08:00
Anton Hansson
a39232ae43
Merge "Add mainline.mk" am: 64bf2593f0
...
am: 082a87e4dc
Change-Id: I49589440943bed5c50f0406b43ff107a13b7be6c
2019-01-08 03:58:10 -08:00
Anton Hansson
83d2837f4b
Merge "Add adb_keys to mainline_system if they exist"
...
am: 3a4a966507
Change-Id: I590b630c0778cd3bebbd337f81c04b29a4831a29
2019-01-08 03:55:09 -08:00
Anton Hansson
082a87e4dc
Merge "Add mainline.mk"
...
am: 64bf2593f0
Change-Id: Ib467f19cada6dddfdaa9a5840d2b24f541c2f7ec
2019-01-08 03:53:58 -08:00
Anton Hansson
3a4a966507
Merge "Add adb_keys to mainline_system if they exist"
2019-01-08 11:40:25 +00:00
Anton Hansson
64bf2593f0
Merge "Add mainline.mk"
2019-01-08 11:40:11 +00:00
Anton Hansson
cac5f873fe
[automerger skipped] Merge "Wifi: Add Wifi library to mainline_system" am: 46441eac2f
am: 27d230b151
...
am: 7af4b55ac2
-s ours
am skip reason: change_id Ifb402ad59e02f6f5c18c2372655a5896e917d5c2 with SHA1 b38ce5a6ff
is in history
Change-Id: Ieacec54c6abc0fe80d950c7cdc3e7637241276a4
2019-01-08 02:41:46 -08:00
Anton Hansson
7af4b55ac2
Merge "Wifi: Add Wifi library to mainline_system" am: 46441eac2f
...
am: 27d230b151
Change-Id: Id3d2aec822b3da313be9d3d808321cbe76ccba97
2019-01-08 02:35:39 -08:00
Anton Hansson
27d230b151
Merge "Wifi: Add Wifi library to mainline_system"
...
am: 46441eac2f
Change-Id: I3d1f06b3ee7ce5c88f1347022cebbda23dd47ae0
2019-01-08 02:31:27 -08:00
Anton Hansson
46441eac2f
Merge "Wifi: Add Wifi library to mainline_system"
2019-01-08 10:22:21 +00:00
Anton Hansson
811f2392c0
Move overridden AOSP modules out of *_system mks
...
All these modules are to be moved to /product, as they are not
part of the core system image. Move them out of the _system mks
as a start, and temporarily whitelist them so that they can be
moved iteratively.
Bug: 122353713
Test: make
Change-Id: If658e6b4565924cd915a183400c5b2b32984eca4
Merged-In: If658e6b4565924cd915a183400c5b2b32984eca4
2019-01-08 10:03:58 +00:00
SzuWei Lin
c0104fb4ed
Merge "Set 32bits Legacy GSI to be 32bits binder" am: ebe0590d0a
am: ec8517adb4
...
am: be5abf1b2a
Change-Id: If883acde4919e3666b4afc0d3ab678710fa0c7d2
2019-01-08 01:58:22 -08:00
SzuWei Lin
be5abf1b2a
Merge "Set 32bits Legacy GSI to be 32bits binder" am: ebe0590d0a
...
am: ec8517adb4
Change-Id: I02fe56f4b231eda0f02dafd6321da082b4b134c1
2019-01-08 01:50:05 -08:00
Anton Hansson
746bcc91cf
Move overridden AOSP modules out of *_system mks
...
All these modules are to be moved to /product, as they are not
part of the core system image. Move them out of the _system mks
as a start, and temporarily whitelist them so that they can be
moved iteratively.
Bug: 122353713
Test: make
Change-Id: If658e6b4565924cd915a183400c5b2b32984eca4
2019-01-08 09:46:31 +00:00
SzuWei Lin
ec8517adb4
Merge "Set 32bits Legacy GSI to be 32bits binder"
...
am: ebe0590d0a
Change-Id: I434cf4d1784166f6b1326902e011349d5a4d3fc0
2019-01-08 01:40:49 -08:00
SzuWei Lin
1457b3fcbf
Refactor GSI BoardConfig.mk
...
The patch modifies the Legacy GSI to use BoardConfigGsiCommon.mk
instead of board config treble-common*.mk, and delete these
treble-common*.mk files.
After the patch, the GSI common board configs are in single file
BoardConfigGsiCommon.mk
The patch also includes:
- Moving `TARGET_COPY_OUT_VENDOR := vendor` to
BoardConfigGsiCommon.mk, because GSI always contains no vendor
contents.
- Configure the binder interface bitness explicitly.
- Unify the structure of each BoardConfig.mk.
Bug: 122282239
Test: compare the out folder between with and without the patch
Test: output files are all the same
Change-Id: Ie5901446920dda317dea848e6d5a7bbcf10a32cf
2019-01-08 17:35:05 +08:00
Ahmed ElArabawy
69e62af873
Wifi: Add Wifi library to mainline_system
...
This commit adds android.hardware.wifi@1.0.so to mainline_system.
Bug: 122363107
Test: Successful build
Test: lunch crosshatch-userdebug ; make -j64
Test: lunch mainline_system_arm64; make -j64
Change-Id: Ifb402ad59e02f6f5c18c2372655a5896e917d5c2
Merged-In: Ifb402ad59e02f6f5c18c2372655a5896e917d5c2
(cherry picked from commit b38ce5a6ff
)
2019-01-08 09:24:48 +00:00