StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,062 Commits 1 Branch 0 Tags
3427186cf30d706c4ac9e5bea8dec7181f449ece
Commit Graph

15062 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jaewoong Jung
3427186cf3 Merge "Add filename property to android_app_import" am: da6a7f458b am: 0018e85876 am: 96c71f5385 
am: cb448954a4

Change-Id: I7570f18427df2673b2d8f0918bd6294d71b566a9
 2019-08-15 14:56:32 -07:00
Adrian Roos
5819a32c2b Merge "[automerger skipped] Merge "API: Add baseline file for API check" into qt-dev am: 5961cb4598 am: 6b56b1171a -s ours 
am: 9303ed2e98 -s ours
am skip reason: change_id Ia10c51fdca10e2a3d1cc3a7bc6d798d447c7b729 with SHA1 4937c4a8ba is in history

Change-Id: Iab16f5fffc0fc5d9379f247690dc9632e8105501
 2019-08-15 14:33:54 -07:00
Adrian Roos
1415af8480 [automerger skipped] Merge "API: Add baseline file for API check" into qt-dev am: 5961cb4598 -s ours am: 611cca0cb8 -s ours 
am: cceedf2508 -s ours
am skip reason: change_id Ia10c51fdca10e2a3d1cc3a7bc6d798d447c7b729 with SHA1 4937c4a8ba is in history

Change-Id: I50936f9b6f30f86afd53a9e72871ed13ad2ac543
 2019-08-15 14:22:52 -07:00
Adrian Roos
6580ceeab7 [automerger skipped] Merge "API: Add baseline file for API check" into qt-dev am: 5961cb4598 am: 6b56b1171a 
am: e73a7df1ba -s ours
am skip reason: change_id Ia10c51fdca10e2a3d1cc3a7bc6d798d447c7b729 with SHA1 14f75a9525 is in history

Change-Id: I1975fb4ea1b512f66ba5e6ef4adce49c4831e1ca
 2019-08-15 14:04:23 -07:00
Jaewoong Jung
cb448954a4 Merge "Add filename property to android_app_import" am: da6a7f458b am: 0018e85876 
am: 96c71f5385

Change-Id: I5c0c29105996e4bbb184af2929211bd0146c0080
 2019-08-15 13:49:59 -07:00
Android Build Merger (Role)
9303ed2e98 Merge "[automerger skipped] Merge "API: Add baseline file for API check" into qt-dev am: 5961cb4598 am: 6b56b1171a -s ours am skip reason: change_id Ia10c51fdca10e2a3d1cc3a7bc6d798d447c7b729 with SHA1 14f75a9525 is in history" into qt-r1-dev-plus-aosp 2019-08-15 20:45:37 +00:00
Adrian Roos
5b4de8bca1 [automerger skipped] Merge "API: Add baseline file for API check" into qt-dev am: 5961cb4598 
am: 6b56b1171a -s ours
am skip reason: change_id Ia10c51fdca10e2a3d1cc3a7bc6d798d447c7b729 with SHA1 14f75a9525 is in history

Change-Id: Ia8d9542364ee92a5c2c531cfda2c9ddd3c31d725
 2019-08-15 13:42:29 -07:00
Adrian Roos
cceedf2508 [automerger skipped] Merge "API: Add baseline file for API check" into qt-dev am: 5961cb4598 -s ours 
am: 611cca0cb8 -s ours
am skip reason: change_id Ia10c51fdca10e2a3d1cc3a7bc6d798d447c7b729 with SHA1 14f75a9525 is in history

Change-Id: I7eac9d7bdfcf070fbac2df99e3563c3df5281e2e
 2019-08-15 13:41:36 -07:00
Adrian Roos
e73a7df1ba Merge "API: Add baseline file for API check" into qt-dev am: 5961cb4598 
am: 6b56b1171a

Change-Id: I8acd9ec4b81444b13d73b208b21bcbc89decc195
 2019-08-15 13:41:21 -07:00
Jaewoong Jung
96c71f5385 Merge "Add filename property to android_app_import" am: da6a7f458b 
am: 0018e85876

Change-Id: I48579f263abb8ebbe592962b6c9e60f59b853efb
 2019-08-15 13:35:27 -07:00
Adrian Roos
6b56b1171a Merge "API: Add baseline file for API check" into qt-dev 
am: 5961cb4598

Change-Id: I986820330843ed71e72a7ac55f6494c09c302118
 2019-08-15 13:18:49 -07:00
Adrian Roos
611cca0cb8 [automerger skipped] Merge "API: Add baseline file for API check" into qt-dev 
am: 5961cb4598 -s ours
am skip reason: change_id Ia10c51fdca10e2a3d1cc3a7bc6d798d447c7b729 with SHA1 14f75a9525 is in history

Change-Id: Icd527361d1ccf44bd130c22aeadd9083d42eb30c
 2019-08-15 13:15:25 -07:00
Jaewoong Jung
0018e85876 Merge "Add filename property to android_app_import" 
am: da6a7f458b

Change-Id: I328f0d0a22adef9f9e9376019bc674d62233f174
 2019-08-15 13:13:28 -07:00
TreeHugger Robot
5961cb4598 Merge "API: Add baseline file for API check" into qt-dev 2019-08-15 18:07:32 +00:00
Jaewoong Jung
da6a7f458b Merge "Add filename property to android_app_import" 2019-08-15 17:29:55 +00:00
Hsin-Yi Chen
805b208a01 Merge "Add tags to the list of lsdump paths" am: eef3366ab3 am: d5c7188d45 am: 02b4c8a5c7 
am: e623cbc7de

Change-Id: I0a3e594679b311ec75d4c878503791a9d833e6aa
 2019-08-14 20:13:55 -07:00
Hsin-Yi Chen
e623cbc7de Merge "Add tags to the list of lsdump paths" am: eef3366ab3 am: d5c7188d45 
am: 02b4c8a5c7

Change-Id: Icdeba8a677c44fb1a4cd98109b81eea001bdbcd1
 2019-08-14 20:03:48 -07:00
Hsin-Yi Chen
02b4c8a5c7 Merge "Add tags to the list of lsdump paths" am: eef3366ab3 
am: d5c7188d45

Change-Id: Ia6af125f7dc2d5f8504c04198342b6b13ab1776d
 2019-08-14 19:54:15 -07:00
Hsin-Yi Chen
d5c7188d45 Merge "Add tags to the list of lsdump paths" 
am: eef3366ab3

Change-Id: Ia08611a0c926ccebfcdbfade31b09878712b82e9
 2019-08-14 19:44:45 -07:00
Hsin-Yi Chen
eef3366ab3 Merge "Add tags to the list of lsdump paths" 2019-08-15 02:20:30 +00:00
Jiyong Park
d22009b7fb Merge "Build native coverage variant of APEXes when needed" am: dcea882ef9 am: e29e7a870a am: 3b0b0ce5a5 
am: 9a504cdc97

Change-Id: I51f7359c399607949a36e176fb1ef4015c568aa1
 2019-08-14 18:25:14 -07:00
Jiyong Park
9a504cdc97 Merge "Build native coverage variant of APEXes when needed" am: dcea882ef9 am: e29e7a870a 
am: 3b0b0ce5a5

Change-Id: I2f5939c4909e91291760cb32e4b601f4f49786db
 2019-08-14 18:04:40 -07:00
Jiyong Park
3b0b0ce5a5 Merge "Build native coverage variant of APEXes when needed" am: dcea882ef9 
am: e29e7a870a

Change-Id: If1f64d9e0e99e37c0936cd39fda34d3344ac82da
 2019-08-14 17:54:37 -07:00
Jiyong Park
e29e7a870a Merge "Build native coverage variant of APEXes when needed" 
am: dcea882ef9

Change-Id: I930078d27e6365f55de7fb77ae58fb538e1aa4f3
 2019-08-14 17:43:36 -07:00
Treehugger Robot
dcea882ef9 Merge "Build native coverage variant of APEXes when needed" 2019-08-15 00:08:59 +00:00
Xin Li
de1310ce62 [automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master am: ef0ba80372 -s ours am: 98a8ee6c16 
am: ccc28e8e68

Change-Id: I26a761c2a7e3c1a465b47aa14f198e6f4caacd1a
 2019-08-14 14:08:03 -07:00
Xin Li
ccc28e8e68 [automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master am: ef0ba80372 -s ours 
am: 98a8ee6c16

Change-Id: I032f0cf51a5fa2b947e73c2b2702fff1f9f9a799
 2019-08-14 13:43:08 -07:00
Xin Li
98a8ee6c16 [automerger skipped] DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master 
am: ef0ba80372 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie0e4d798b29bf18846a7f2abf91635e0be827465
 2019-08-14 13:18:00 -07:00
Xin Li
ef0ba80372 DO NOT MERGE - Skip qt-dev-plus-aosp-without-vendor (5713463) in stage-aosp-master 
Bug: 134405016
Change-Id: Iae1b9aef33d27d024796ca4c551cec453807e643
 2019-08-14 11:35:07 -07:00
Alexander Smundak
7abfd0d511 Merge "The script to generate input for the cross-referencing pipeline." am: 05098c9c61 am: 5782d6f406 am: f544a7c755 
am: e4acca4bfc

Change-Id: Id2bc9e9c47e32c1c8788047d400f647f22f96c1a
 2019-08-14 09:22:45 -07:00
Alexander Smundak
e4acca4bfc Merge "The script to generate input for the cross-referencing pipeline." am: 05098c9c61 am: 5782d6f406 
am: f544a7c755

Change-Id: I51f564b62f9ead60af8a338e2212aea3bf323127
 2019-08-14 09:15:44 -07:00
Alexander Smundak
f544a7c755 Merge "The script to generate input for the cross-referencing pipeline." am: 05098c9c61 
am: 5782d6f406

Change-Id: I4cd883fa6e80dcb36730d223532eb7aa9b397f4d
 2019-08-14 09:08:40 -07:00
Alexander Smundak
5782d6f406 Merge "The script to generate input for the cross-referencing pipeline." 
am: 05098c9c61

Change-Id: Ibd65180c0c2ac6500d86fa1904e09f178fda876e
 2019-08-14 08:57:53 -07:00
Alexander Smundak
05098c9c61 Merge "The script to generate input for the cross-referencing pipeline." 2019-08-14 15:43:54 +00:00
Adrian Roos
1782e71b7b Merge "API: Add baseline file for API check" am: 2bfc6bf896 am: 991093b0cb am: 58e83b9c7b 
am: 541ebaadc0

Change-Id: Ifdae36c487ad2b2ac9cff9190c4653eecf0de967
 2019-08-14 08:38:12 -07:00
Adrian Roos
541ebaadc0 Merge "API: Add baseline file for API check" am: 2bfc6bf896 am: 991093b0cb 
am: 58e83b9c7b

Change-Id: I77ddaaab96d91aedd2211c17eabbcf983b7f5107
 2019-08-14 08:26:43 -07:00
Adrian Roos
58e83b9c7b Merge "API: Add baseline file for API check" am: 2bfc6bf896 
am: 991093b0cb

Change-Id: I740fd25537c5420f710de443123079d56507852b
 2019-08-14 08:18:07 -07:00
Adrian Roos
991093b0cb Merge "API: Add baseline file for API check" 
am: 2bfc6bf896

Change-Id: I463152cab6aa2a7052a63e703ab9c550fd1567f0
 2019-08-14 08:11:24 -07:00
Adrian Roos
2bfc6bf896 Merge "API: Add baseline file for API check" 2019-08-14 14:39:18 +00:00
Colin Cross
2a60b416ee Merge "Add 'Additional_manifest' property to merge other manifests" am: 81c5f99808 am: 2c4803b3cd am: 48f9e82044 
am: a447b0d300

Change-Id: I8153e4c703212aa2f3efd63613555a59e10b8e9e
 2019-08-13 19:00:10 -07:00
Colin Cross
a447b0d300 Merge "Add 'Additional_manifest' property to merge other manifests" am: 81c5f99808 am: 2c4803b3cd 
am: 48f9e82044

Change-Id: I6aaa9a06630b446809b4e3755c5fc19ad8624057
 2019-08-13 18:47:49 -07:00
Colin Cross
48f9e82044 Merge "Add 'Additional_manifest' property to merge other manifests" am: 81c5f99808 
am: 2c4803b3cd

Change-Id: I23d7d1327abaef244f35c1de51942eba96134fcd
 2019-08-13 18:36:06 -07:00
Colin Cross
2c4803b3cd Merge "Add 'Additional_manifest' property to merge other manifests" 
am: 81c5f99808

Change-Id: If7311f20b7d574ce45dca7c4617877b941eb96bd
 2019-08-13 18:22:39 -07:00
Colin Cross
81c5f99808 Merge "Add 'Additional_manifest' property to merge other manifests" 2019-08-14 00:47:27 +00:00
Sasha Smundak
cb86c3c532 The script to generate input for the cross-referencing pipeline. 
Bug: 137977523
Test: manual
Change-Id: I80faee8db12f0d8e85a09aa9d96fbfc04af19bf8
 2019-08-13 14:45:52 -07:00
Adrian Roos
4937c4a8ba API: Add baseline file for API check 
Bug: 139128921
Test: m apicheck
Change-Id: Ia10c51fdca10e2a3d1cc3a7bc6d798d447c7b729
Merged-In: Ia10c51fdca10e2a3d1cc3a7bc6d798d447c7b729
 2019-08-13 15:38:52 +00:00
Adrian Roos
14f75a9525 API: Add baseline file for API check 
Bug: 139128921
Test: m apicheck
Change-Id: Ia10c51fdca10e2a3d1cc3a7bc6d798d447c7b729
 2019-08-13 14:37:21 +00:00
changho.shin
b5432b7a3d Add 'Additional_manifest' property to merge other manifests 
This is equivalent to 'LOCAL_FULL_LIBS_MANIFEST_FILES' in Make.

Fixes: 123374442
Test: m -j
Change-Id: Ic4b40a08f2454687c74949020598651acea3b2dd
 2019-08-13 08:30:00 +00:00
Jiyong Park
9295dbadd7 Merge "java_import can be included in apex" am: f02f30952d am: 046a62833c am: 39ba226192 
am: 4756525503

Change-Id: I67b9b9db35b6bb7dfe5e04b974b7d0325363b49a
 2019-08-12 22:19:25 -07:00
Jiyong Park
4756525503 Merge "java_import can be included in apex" am: f02f30952d am: 046a62833c 
am: 39ba226192

Change-Id: I18b18634b786c787f0ea693210b504bb7b2ae63c
 2019-08-12 22:09:28 -07:00