StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,729 Commits 1 Branch 0 Tags
e7184139f6fd048da51d6e33e999a95fb0d686e0
Commit Graph

19729 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Automerger Merge Worker
e7184139f6 Merge "Document apex and apex_test" am: a871ee2067 am: e0d6f7d9d3 am: d27a333182 
Change-Id: Iabbff9fe6d65618de71347ead245fc43136454c9
 2020-02-11 03:39:25 +00:00
Automerger Merge Worker
d27a333182 Merge "Document apex and apex_test" am: a871ee2067 am: e0d6f7d9d3 
Change-Id: Ie92a4937d1384eb83f465213aa6c172d864c5fce
 2020-02-11 03:22:03 +00:00
Automerger Merge Worker
e0d6f7d9d3 Merge "Document apex and apex_test" am: a871ee2067 
Change-Id: If96e254184f5b494eab775d29f234a2ab7740fdb
 2020-02-11 03:12:35 +00:00
Treehugger Robot
a871ee2067 Merge "Document apex and apex_test" 2020-02-11 03:03:23 +00:00
Automerger Merge Worker
470eb0caca Merge "Implement vendor snapshot" am: 705cd4600d am: 7f811dcd28 am: 144cbd9211 
Change-Id: If142df7cecd1f2468df240d06c6cb9458ea9eadb
 2020-02-11 00:27:29 +00:00
Automerger Merge Worker
144cbd9211 Merge "Implement vendor snapshot" am: 705cd4600d am: 7f811dcd28 
Change-Id: I6442b4b3f8cfe6e903eee62c089dd4d3e8156ab1
 2020-02-11 00:08:22 +00:00
Automerger Merge Worker
7f811dcd28 Merge "Implement vendor snapshot" am: 705cd4600d 
Change-Id: Idc852df62be109ce969e79dd2c54267c7894c1eb
 2020-02-10 23:52:53 +00:00
Treehugger Robot
705cd4600d Merge "Implement vendor snapshot" 2020-02-10 23:40:50 +00:00
Jiyong Park
fce0b4209f Document apex and apex_test 
Bug: 149082647
Test: m
Change-Id: I39e72eecda1d0e2984a3dde4987c4928f58d2afc
 2020-02-11 03:56:06 +09:00
Automerger Merge Worker
79b26d4554 Merge "Pass library kind when linking native libraries." am: 2b2aee33a7 am: 4fb5002458 am: 70cb362591 
Change-Id: I736b4665fe8bae052a222ddeff1273f8cc6f3270
 2020-02-10 17:40:19 +00:00
Automerger Merge Worker
70cb362591 Merge "Pass library kind when linking native libraries." am: 2b2aee33a7 am: 4fb5002458 
Change-Id: I57710471b2df9a0d89d783a95bf2cee497fcb9ee
 2020-02-10 17:22:05 +00:00
Automerger Merge Worker
4fb5002458 Merge "Pass library kind when linking native libraries." am: 2b2aee33a7 
Change-Id: I0fcbb598a97ca8d2f292d3c838c67104eb104caf
 2020-02-10 17:10:42 +00:00
Ivan Lozano
2b2aee33a7 Merge "Pass library kind when linking native libraries." 2020-02-10 16:50:40 +00:00
Automerger Merge Worker
4056e5044b java_sdk_library_import - Allow it to replace java_sdk_library am: 0bdcb27970 am: 3a12c94bc9 am: 58c8790849 
Change-Id: I2d249bb20be3943e843f0d281a1988fedeb80001
 2020-02-10 11:27:32 +00:00
Automerger Merge Worker
ae629959e0 Merge "java_sdk_library - pass patch_module through to stubs library" am: 3b531e3c85 am: f731846322 am: 0f40429eed 
Change-Id: I4319a7bd092fb1ade6d569daf3f7f91874e1cf8d
 2020-02-10 11:27:21 +00:00
Automerger Merge Worker
58c8790849 java_sdk_library_import - Allow it to replace java_sdk_library am: 0bdcb27970 am: 3a12c94bc9 
Change-Id: Ib6fed54e96e145251ca55ebc49b1db1797a83277
 2020-02-10 11:15:54 +00:00
Automerger Merge Worker
0f40429eed Merge "java_sdk_library - pass patch_module through to stubs library" am: 3b531e3c85 am: f731846322 
Change-Id: I575423e4a8ecc29781c8c5c11285cee2d9563445
 2020-02-10 11:15:45 +00:00
Automerger Merge Worker
3a12c94bc9 java_sdk_library_import - Allow it to replace java_sdk_library am: 0bdcb27970 
Change-Id: Ic3200366fc92fefdd568d9f87e15e58caf73c254
 2020-02-10 10:57:03 +00:00
Automerger Merge Worker
f731846322 Merge "java_sdk_library - pass patch_module through to stubs library" am: 3b531e3c85 
Change-Id: I5ce03ac14084048f2223fe14b26f86fc52b4ebd2
 2020-02-10 10:56:53 +00:00
Paul Duffin
0bdcb27970 java_sdk_library_import - Allow it to replace java_sdk_library 
Previously a java_sdk_library_import module did not replace the
corresponding java_sdk_library module, even when it was marked as
prefer=true. That is because the java_sdk_library_import had an empty
set of sources.	However, the stubs modules that are created by the
java_sdk_library_import did override the stubs modules created by the
corresponding java_sdk_library module.

That created inconsistent behavior between the cases where only the
prebuilt is available and both source and prebuilt are available and
the prebuilt is preferred. e.g. assume a java_sdk_library/import module
called SDKLIB.

When both prebuilt and source modules are available for SDKLIB then
even if the prebuilt is preferred then any dependencies on the
SDKLIB module would use the source module.

This change fixes that inconsisteny by making the array of sources
non-empty.

Bug: 148080325
Test: m droid && TARGET_BUILD_APPS=Camera2 m
Change-Id: I25395e020393921735ada20c5492f27f1260f6c5
 2020-02-10 10:45:29 +00:00
Paul Duffin
3b531e3c85 Merge "java_sdk_library - pass patch_module through to stubs library" 2020-02-10 10:42:34 +00:00
Automerger Merge Worker
0ec2b81ee5 Merge "add walkPayloadDeps" am: 58b5030e30 am: 1cf0db8136 am: 230eceddce 
Change-Id: Id9b071d99aa88fcfad5af8500836e0971f694647
 2020-02-10 06:16:59 +00:00
Automerger Merge Worker
230eceddce Merge "add walkPayloadDeps" am: 58b5030e30 am: 1cf0db8136 
Change-Id: Ib266fa82bcd70fd39a663ebcaa60d5c0148cc0b1
 2020-02-10 05:58:13 +00:00
Automerger Merge Worker
1cf0db8136 Merge "add walkPayloadDeps" am: 58b5030e30 
Change-Id: I6ad05ac167f0b50b451fe905f69c4f04b9e234c2
 2020-02-10 05:41:38 +00:00
Jiyong Park
58b5030e30 Merge "add walkPayloadDeps" 2020-02-10 05:20:59 +00:00
Automerger Merge Worker
659b519539 Merge "<apexname>-installed-file.txt shows symlinks" am: 22f3ce1ea7 am: 77baed21ee am: f08f2f1b11 
Change-Id: Ifb286f5eee5aa741c24cfc1afce6c089b838f262
 2020-02-10 04:27:34 +00:00
Automerger Merge Worker
f08f2f1b11 Merge "<apexname>-installed-file.txt shows symlinks" am: 22f3ce1ea7 am: 77baed21ee 
Change-Id: I452ec82f9dfc12280b84f2571197e78e7db9095d
 2020-02-10 04:09:21 +00:00
Automerger Merge Worker
77baed21ee Merge "<apexname>-installed-file.txt shows symlinks" am: 22f3ce1ea7 
Change-Id: I11099256c34ba31054dca2b83367ff0f36fde8bd
 2020-02-10 03:55:52 +00:00
Jiyong Park
22f3ce1ea7 Merge "<apexname>-installed-file.txt shows symlinks" 2020-02-10 03:44:00 +00:00
Automerger Merge Worker
037a2ebe04 Merge "Remove UseApexImage and GenerateApexImage." am: d862f0bce7 am: a80e0e808b am: d8029aa391 
Change-Id: I18ccfbc97c076ba1d1c4bad9ccb77225fe3caf01
 2020-02-09 23:44:08 +00:00
Automerger Merge Worker
d8029aa391 Merge "Remove UseApexImage and GenerateApexImage." am: d862f0bce7 am: a80e0e808b 
Change-Id: I2d35a34e3b85da513ad0bb16b28495b7f3396d07
 2020-02-09 23:33:09 +00:00
Automerger Merge Worker
a80e0e808b Merge "Remove UseApexImage and GenerateApexImage." am: d862f0bce7 
Change-Id: I1e8c4bd829f8538ce013380de2654f10ce970907
 2020-02-09 23:17:22 +00:00
Nicolas Geoffray
d862f0bce7 Merge "Remove UseApexImage and GenerateApexImage." 2020-02-09 22:53:56 +00:00
Automerger Merge Worker
f8f5535fe7 Fix sdk aidl include for droiddoc am: 26bf49b0b2 am: 0130538069 am: 5f327eccc1 
Change-Id: I16869c333576cdba8121c33d2416b7ca8f0e1eb0
 2020-02-09 14:10:08 +00:00
Automerger Merge Worker
5f327eccc1 Fix sdk aidl include for droiddoc am: 26bf49b0b2 am: 0130538069 
Change-Id: I56ac061ae3ce80b79f49ded3ff6b20baba11d57b
 2020-02-09 13:55:51 +00:00
Automerger Merge Worker
0130538069 Fix sdk aidl include for droiddoc am: 26bf49b0b2 
Change-Id: I32175997110d76f39ac8442aaeb0f1c07cefd701
 2020-02-09 13:31:17 +00:00
Anton Hansson
26bf49b0b2 Fix sdk aidl include for droiddoc 
Prior to this change droidstubs modules that set sdk_version
did not get framework.aidl added to its aidl includes.

Bug: 149138391
Test: patch CL in bug && m system_aidl_test-droidstubs
Change-Id: I92ab344c8a4311e10c1e5c8ebf525fa2dc704075
(cherry picked from commit f278ca60e06da86c67f6a3865c290f8451657ce9)
 2020-02-08 20:37:07 +00:00
Paul Duffin
ab8da5dd53 java_sdk_library - pass patch_module through to stubs library 
When building java.lang classes it is necessary to compile them using
patch_module: "java.base". This change causes patch_module to be passed
through to the java_library created to compile the stubs to allow this
to be used to generate stubs for java.lang.

Test: m droid
Change-Id: I7c27953a5d782eeedd7f25e849ab444d28e28228
 2020-02-08 10:38:52 +00:00
Jiyong Park
bd63a108a0 <apexname>-installed-file.txt shows symlinks 
Bug: 147605944
Test: m and inspect the generated txt files
Change-Id: I26ecaf66a531478d22fb4611bb4ea19e92ef132e
 2020-02-08 17:18:03 +09:00
Automerger Merge Worker
df209eab88 Merge "Differentiate between exported and internal sdk members" am: 7a8a425566 am: be6804a21d am: 17a948af00 
Change-Id: I1e0930ea793c688f2ceddd1179dfa3b9ef09e606
 2020-02-08 01:00:10 +00:00
Automerger Merge Worker
17a948af00 Merge "Differentiate between exported and internal sdk members" am: 7a8a425566 am: be6804a21d 
Change-Id: I4ac636a186c8d73adef64ba8f6c79124ddc62d66
 2020-02-08 00:36:13 +00:00
Automerger Merge Worker
be6804a21d Merge "Differentiate between exported and internal sdk members" am: 7a8a425566 
Change-Id: Ia768672d2b3daecb4cd24612489887ef7aedc8a6
 2020-02-08 00:17:42 +00:00
Treehugger Robot
7a8a425566 Merge "Differentiate between exported and internal sdk members" 2020-02-08 00:12:04 +00:00
Automerger Merge Worker
bc8cddc4a9 [automerger skipped] Merge "Add android.hardware.light-ndk_platform to vndkMustUseVendorVariantList" am: c17a04dbbb am: 9bbb25fc3a am: 88a71489ef -s ours 
am skip reason: Change-Id Ib09baa946faff8334f7c50568db5e6735dfbbfe2 with SHA-1 1415cb8397 is in history

Change-Id: Ie3e809df1fddb5abbbb4a9f4eaa1708407a57a0e
 2020-02-07 21:09:14 +00:00
Automerger Merge Worker
88a71489ef Merge "Add android.hardware.light-ndk_platform to vndkMustUseVendorVariantList" am: c17a04dbbb am: 9bbb25fc3a 
Change-Id: I82775677286c2d41c1311334ceaa069bef2edfc7
 2020-02-07 20:55:43 +00:00
Automerger Merge Worker
9bbb25fc3a Merge "Add android.hardware.light-ndk_platform to vndkMustUseVendorVariantList" am: c17a04dbbb 
Change-Id: I00ac5ac05893c9746cc1af622a172aa4295fc59f
 2020-02-07 20:36:09 +00:00
Treehugger Robot
c17a04dbbb Merge "Add android.hardware.light-ndk_platform to vndkMustUseVendorVariantList" 2020-02-07 20:22:52 +00:00
Automerger Merge Worker
8401f47238 Merge "Add java_system_modules to sdk/module_exports" am: 568a82a36e am: 47511a0393 am: 5ce0ebb0df 
Change-Id: Ie4414798a4ce32b6d943260ec6229fde9abc005d
 2020-02-07 18:43:18 +00:00
Automerger Merge Worker
5ce0ebb0df Merge "Add java_system_modules to sdk/module_exports" am: 568a82a36e am: 47511a0393 
Change-Id: I8d9f00f19de5689f4b4673b95a56c41b91522fc3
 2020-02-07 18:24:18 +00:00
Automerger Merge Worker
47511a0393 Merge "Add java_system_modules to sdk/module_exports" am: 568a82a36e 
Change-Id: I74d7795e5a22c11a253508a37b2215bedcd2b778
 2020-02-07 18:11:55 +00:00