Nicolas Geoffray
c5685e945e
Merge "Add a DEX2OAT_BOOTCLASSPATH variable." am: 9ce33353c5
am: 706eb5dda6
...
am: 8b482295b6
Change-Id: I6f1583c57d14395b4d506291fa74802e3adb4e00
2019-02-26 13:17:01 -08:00
Nicolas Geoffray
8b482295b6
Merge "Add a DEX2OAT_BOOTCLASSPATH variable." am: 9ce33353c5
...
am: 706eb5dda6
Change-Id: Ifc5f5f3e961e1b0c4298f81b71cc2f26f7c39a7f
2019-02-26 13:08:56 -08:00
Nicolas Geoffray
706eb5dda6
Merge "Add a DEX2OAT_BOOTCLASSPATH variable."
...
am: 9ce33353c5
Change-Id: I733106f9d1800cd81729581f428cd178543c9b04
2019-02-26 13:00:50 -08:00
Nicolas Geoffray
9ce33353c5
Merge "Add a DEX2OAT_BOOTCLASSPATH variable."
2019-02-26 20:38:32 +00:00
Sasha Smundak
2b4ccc74ea
Merge "Handle $(LOCAL_PATH) in androidmk" am: b42c1aa8e4
am: 130f65128a
...
am: 3adc3b93d9
Change-Id: Ic9184f39b6399f8241a243a95acd5837bc4da47a
2019-02-26 08:46:23 -08:00
Sasha Smundak
3adc3b93d9
Merge "Handle $(LOCAL_PATH) in androidmk" am: b42c1aa8e4
...
am: 130f65128a
Change-Id: I3a44cc3b4959c8b1a690063b478aa94e01d7eddc
2019-02-26 08:42:20 -08:00
Sasha Smundak
130f65128a
Merge "Handle $(LOCAL_PATH) in androidmk"
...
am: b42c1aa8e4
Change-Id: I4b70812629f91ab8f52c65114aab55a83ea6d6e6
2019-02-26 08:38:17 -08:00
Treehugger Robot
b42c1aa8e4
Merge "Handle $(LOCAL_PATH) in androidmk"
2019-02-26 16:30:28 +00:00
Nicolas Geoffray
07b4007f1d
Add a DEX2OAT_BOOTCLASSPATH variable.
...
Bug: 119800099
Test: m
Change-Id: If4b49b1bed33564b9237f8ae2ac35ef0d631703c
2019-02-26 12:55:37 +00:00
Jiyong Park
54374fc5b7
Merge "Add recovery_available property to sysprop module" am: 015fa7e2e6
am: cd77e235fd
...
am: f46d77acef
Change-Id: I1b087837d662bbab391710503db6be4524f1cd86
2019-02-25 23:22:31 -08:00
Jiyong Park
f46d77acef
Merge "Add recovery_available property to sysprop module" am: 015fa7e2e6
...
am: cd77e235fd
Change-Id: I86dcdd3b2557bf895a6de8d393d262bdbc36ffef
2019-02-25 23:12:30 -08:00
Jiyong Park
6d0e062bc4
Merge "Fix: sysprop module can't be used with whole_static_libs" am: 7aac193fa8
am: e8c8a63a57
...
am: cd1a3247ed
Change-Id: I18ef60bfb0e85bbd5fecc5b96cebf03ea3bc93de
2019-02-25 22:57:23 -08:00
Jiyong Park
cd77e235fd
Merge "Add recovery_available property to sysprop module"
...
am: 015fa7e2e6
Change-Id: I0c38f6eb7ea84f0488b1900a536c780302e1bf28
2019-02-25 22:56:32 -08:00
Jiyong Park
cd1a3247ed
Merge "Fix: sysprop module can't be used with whole_static_libs" am: 7aac193fa8
...
am: e8c8a63a57
Change-Id: I1e8cc9a150da37ef48d0ad7aae153c17c5a005ff
2019-02-25 22:44:14 -08:00
Jiyong Park
e8c8a63a57
Merge "Fix: sysprop module can't be used with whole_static_libs"
...
am: 7aac193fa8
Change-Id: I0e174e52629c7cb0bf240d366d82fdfc65e66ab8
2019-02-25 22:40:27 -08:00
Jaewoong Jung
8b9bbb4812
Merge "soong_docs build link error fix." am: 18d3fe02ac
am: 3a629f4bbc
...
am: cdb7a7671b
Change-Id: I4590a44248f695385d072abc8c63f8280f41d513
2019-02-25 22:32:40 -08:00
Alex Light
bc6564c12d
Merge "Include symlinks in flattened apexs" am: e74c417f81
am: 2d778f7150
...
am: 41d9f593fc
Change-Id: I3c179d960a272a9849134843a75474b512bde41e
2019-02-25 22:29:06 -08:00
Nicolas Geoffray
d4916949c1
Merge "Don't return null for an interface type." am: 56e0290551
am: 6a1ea2e8a3
...
am: b60ce369b3
Change-Id: Idbdedc6b20c0fe0343228f3cd13addeb48f59235
2019-02-25 22:25:42 -08:00
Jaewoong Jung
cdb7a7671b
Merge "soong_docs build link error fix." am: 18d3fe02ac
...
am: 3a629f4bbc
Change-Id: I615c5e0dfae076f0b90152f182481389cc25ab4a
2019-02-25 22:14:28 -08:00
Alex Light
41d9f593fc
Merge "Include symlinks in flattened apexs" am: e74c417f81
...
am: 2d778f7150
Change-Id: I38ec84c0aaed446440ce5526c6e68f0e61649bc6
2019-02-25 22:11:46 -08:00
Sasha Smundak
75a50d9fb7
Merge "Handle LOCAL_MODULE_PATH assignment for android_test modules" am: 9ce7e58c04
am: f5d316b6ef
...
am: 754b5a313d
Change-Id: I1cc97f071bdaf5c04de541040754447dc98bdacb
2019-02-25 22:09:10 -08:00
Nicolas Geoffray
b60ce369b3
Merge "Don't return null for an interface type." am: 56e0290551
...
am: 6a1ea2e8a3
Change-Id: If663d712cba23eaf572ec374c69ac14ecd11b9d9
2019-02-25 22:08:07 -08:00
Sasha Smundak
754b5a313d
Merge "Handle LOCAL_MODULE_PATH assignment for android_test modules" am: 9ce7e58c04
...
am: f5d316b6ef
Change-Id: I600a6d432b03f5b323d7d958d5b9f860f54835b3
2019-02-25 21:57:49 -08:00
Treehugger Robot
015fa7e2e6
Merge "Add recovery_available property to sysprop module"
2019-02-26 05:41:08 +00:00
Treehugger Robot
7aac193fa8
Merge "Fix: sysprop module can't be used with whole_static_libs"
2019-02-26 05:39:47 +00:00
Nicolas Geoffray
855b1c7475
Merge "Support for install multiple boot images." am: d79df83b28
am: 5300094ca7
...
am: 63ab163d56
Change-Id: Iebb61079453f7e33ff41b8dae4ca8b032d35162a
2019-02-25 21:06:22 -08:00
Nicolas Geoffray
63ab163d56
Merge "Support for install multiple boot images." am: d79df83b28
...
am: 5300094ca7
Change-Id: Id745e70fa04f7d8cf7a9d03d12355e3c058f9ac2
2019-02-25 20:10:23 -08:00
Xin Li
f4044d633c
[automerger skipped] Merge "DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master" into stage-aosp-master am: 985fea9dae
-s ours
...
am: 4e61f4264d
-s ours
am skip reason: subject contains skip directive
Change-Id: Ie5782ef5c0d35a4dd657ff1c85be829d4d692a64
2019-02-25 17:42:14 -08:00
Jiyong Park
854a9440dd
Add recovery_available property to sysprop module
...
This is required for a sysprop module to be used by a module like the
init which is available both in core and recovery variants.
Test: m
Change-Id: I075428289f5bdce26e931ccf3262793ca6e4a0fd
2019-02-26 10:27:13 +09:00
Jiyong Park
5d1598f746
Fix: sysprop module can't be used with whole_static_libs
...
When a sysprop module is listed in whole_static_libs, it is renamed to
"lib" + <module> to actually refer to the generated C++ library for the
sysprop module.
Test: m (sysprop_test amended)
Change-Id: I05eddb24433d444376787be567830929ef078159
2019-02-26 10:26:44 +09:00
Xin Li
4e61f4264d
[automerger skipped] Merge "DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master" into stage-aosp-master
...
am: 985fea9dae
-s ours
am skip reason: subject contains skip directive
Change-Id: I687ac3f902c44cc0cd97db0e369ad29100063045
2019-02-25 17:15:03 -08:00
Xin Li
e290f307e4
[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master am: ced438cafc
-s ours
...
am: ec88357ac3
-s ours
am skip reason: subject contains skip directive
Change-Id: I7c89076fcf296a29f422c206234bdd5a38a0547f
2019-02-25 17:13:30 -08:00
Jaewoong Jung
3a629f4bbc
Merge "soong_docs build link error fix."
...
am: 18d3fe02ac
Change-Id: Ifdf5526718f4ee9c911cc6fe80e6ce7d71d71352
2019-02-25 16:10:54 -08:00
Xin Li
ec88357ac3
[automerger skipped] DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
...
am: ced438cafc
-s ours
am skip reason: subject contains skip directive
Change-Id: Ied71798e08fd3fce8c6bbf75de18095c4629fa2d
2019-02-25 16:10:22 -08:00
Alex Light
2d778f7150
Merge "Include symlinks in flattened apexs"
...
am: e74c417f81
Change-Id: I9199f46337591b4f18bd00b13f9076080ae6e41c
2019-02-25 15:56:13 -08:00
Sasha Smundak
1d318cbaa9
Handle $(LOCAL_PATH) in androidmk
...
The variables LOCAL_ADDITIONAL_CERTIFICATES. LOCAL_ASSET_DIR,
LOCAL_CERTIFICATE, LOCAL_JARJAR_RULES, LOCAL_PROGUARD_FLAG_FILES,
LOCAL_RESOURCE_DIR specify the paths relative to the top of the
source tree using $(LOCAL_PATH)/. Remove it when converting to
blueprint files and diagnose the cases when these paths do not start
with $(LOCAL_PATH).
Fixes: 122728056
Test: Internal tests
Change-Id: Id3fcacdd5445a97365c03e00656291bfe829c035
2019-02-25 15:19:06 -08:00
Jaewoong Jung
18d3fe02ac
Merge "soong_docs build link error fix."
2019-02-25 22:04:27 +00:00
Treehugger Robot
e74c417f81
Merge "Include symlinks in flattened apexs"
2019-02-25 21:53:41 +00:00
Jaewoong Jung
90e1155135
soong_docs build link error fix.
...
This adds a script to copy the current page's base url to hrefs in the
doc.
Fixes: 123473548
Test: m soong_docs
Change-Id: I8a8ac0f9ba6c0d57ed83db2155955a95e070a265
2019-02-25 10:26:46 -08:00
Alex Light
f4857cf3dd
Include symlinks in flattened apexs
...
Flattened apexs were not including symlinks. This could cause expected
files not to be present.
Test: lunch aosp_marlin-userdebug
m droid
stat $OUT/system/apex/com.android.runtime.debug/bin/dalvikvm
Bug: 124924906
Change-Id: I04e696602b776b383bf7198eb19220353df74192
2019-02-25 10:14:55 -08:00
Jaewoong Jung
c98cbaf104
Merge "Split up Soong build doc." am: e608a51b06
am: 1d61042690
...
am: c7ab1704e3
Change-Id: I7483d25d3325c84a6f87f142bcf05878a9f5dd5f
2019-02-25 08:54:52 -08:00
Jaewoong Jung
c7ab1704e3
Merge "Split up Soong build doc." am: e608a51b06
...
am: 1d61042690
Change-Id: I6edb3f5afab018a1be45c352572e6cd7a30ac99f
2019-02-25 08:09:45 -08:00
Nicolas Geoffray
6a1ea2e8a3
Merge "Don't return null for an interface type."
...
am: 56e0290551
Change-Id: Ic94068be61eb588b3695dc06e194a2599d3160ef
2019-02-24 13:50:04 -08:00
Nicolas Geoffray
56e0290551
Merge "Don't return null for an interface type."
2019-02-24 21:42:38 +00:00
Sasha Smundak
f5d316b6ef
Merge "Handle LOCAL_MODULE_PATH assignment for android_test modules"
...
am: 9ce7e58c04
Change-Id: I93669ce47cc424f590d7dc16a635d21c34e44a18
2019-02-24 12:37:59 -08:00
Treehugger Robot
9ce7e58c04
Merge "Handle LOCAL_MODULE_PATH assignment for android_test modules"
2019-02-24 20:27:24 +00:00
Nicolas Geoffray
27c7cc6c32
Don't return null for an interface type.
...
Otherwise we get:
internal error: panic in GenerateBuildActions for singleton dex_bootjars
interface conversion: interface is nil, not android.WritablePath
Test: build/soong/scripts/build-ndk-prebuilts.sh
Change-Id: I9d8484994d1b5120f0187861a8acaf20e94827f6
2019-02-24 16:04:52 +00:00
Nicolas Geoffray
5300094ca7
Merge "Support for install multiple boot images."
...
am: d79df83b28
Change-Id: Ie74e3f4fb92618abace2852560361a912505b4c0
2019-02-24 05:46:48 -08:00
Nicolas Geoffray
d79df83b28
Merge "Support for install multiple boot images."
2019-02-24 13:37:01 +00:00
Alex Light
ef49318532
Merge "Don't use stubs for host apexs" am: e91a078271
am: 0db86c9eef
...
am: 749642bacd
Change-Id: Ie42dcd2d22880638556998a5d40cb5a40e1bee30
2019-02-22 20:46:04 -08:00