Commit Graph

21355 Commits

Author SHA1 Message Date
Colin Cross
a70706374b Merge "Revert "Add sdk mutator for native modules"" am: d66b121000 am: 193bdf5784
Change-Id: Ia2d6c0819863ebe6d4166c32b5d06ea1742952c3
2020-04-07 04:58:56 +00:00
Colin Cross
4afb560a76 Merge "Revert "Add sdk mutator for native modules"" am: d66b121000 am: 193bdf5784
Change-Id: Id45f244ee8a091e31be765b48f3e173bbf6d00fd
2020-04-07 04:57:37 +00:00
Colin Cross
193bdf5784 Merge "Revert "Add sdk mutator for native modules"" am: d66b121000
Change-Id: Idac6294deaf089ada8544e681b9e0c1c5f37e243
2020-04-07 04:39:25 +00:00
Colin Cross
d66b121000 Merge "Revert "Add sdk mutator for native modules"" 2020-04-07 04:25:34 +00:00
Colin Cross
f8e80229fe Revert "Add sdk mutator for native modules"
Revert submission 1242911-sdk_version_variant

Reason for revert: b/153394225
Reverted Changes:
Ife99745fb:Use libnativewindow for platform variant of libagq...
I1bae84c43:Use libnativewindow for platform variant of androi...
I6e6021ed3:Use stl to depend on libc++
Ife99745fb:Use libnativewindow for platform variant of libRSS...
I2c9f439b9:Fix static dependency on libprotobuf-cpp-lite-ndk
Iff2aff9cf:Set sdk_version for cc_genrules used by modules wi...
I7d72934aa:Add sdk mutator for native modules
Ief378a007:Use sdk variant of Soong modules when LOCAL_SDK_VE...

Bug: 149591340
Change-Id: I798fa902c779469c6382b6699351e5d12bf14785
Fixes: 153394225
2020-04-07 04:21:21 +00:00
Colin Cross
365d94c660 Merge "Add sdk mutator for native modules" am: f5d6756a35 am: 0cc91697fe
Change-Id: I96646663a8455e7a4e8184e0a2db6b22b11b75e3
2020-04-07 02:35:40 +00:00
Colin Cross
9de1e9a6aa Merge "Add sdk mutator for native modules" am: f5d6756a35 am: 0cc91697fe
Change-Id: Ib7f01832ba0969a87dee9d724f7da61f856269c1
2020-04-07 02:25:53 +00:00
Colin Cross
0cc91697fe Merge "Add sdk mutator for native modules" am: f5d6756a35
Change-Id: Ie2716b58c5c974b2b5da5f6a04769e677490301e
2020-04-07 02:05:11 +00:00
Colin Cross
f5d6756a35 Merge "Add sdk mutator for native modules" 2020-04-07 01:52:11 +00:00
David Srbecky
6c4b0523c4 Merge "Fix dex-location for host." am: c7b02cb523 am: 178c0807e7
Change-Id: I7da0dd3a27cdf5409921eb2eb2beaf0f0926d14d
2020-04-06 22:29:45 +00:00
David Srbecky
fb427316b4 Merge "Fix dex-location for host." am: c7b02cb523 am: 178c0807e7
Change-Id: If6924cf10fd080db1be2691f6fadc4da3693f0c0
2020-04-06 22:28:40 +00:00
Diego Wilson
a5d9653cc5 Only mount dist dir to soong sandbox if it exists
The dist dir is created late in the build process. If a
soong sandbox attempts to mount it before it's created
the sandbox will create an empty file in its place.

Test: lunch aosp_cf_x86_phone-userdebug && make -j dist
Change-Id: Ie6513bf702de6e6322c78753d406d70ea3ccc04d
2020-04-06 22:07:56 +00:00
Martin Stjernholm
bdd0dffc1b Do not propagate the stub symbol file to prebuilts.
This partially reverts https://r.android.com/1278193. The propagated
symbol files contain all versions, even though only one is applicable
in a given SDK snapshot.

It's uncertain what repercussions this might have, but one is that if
we were to update a snapshot for a fixed version then it might change
because the symbol file contains new versions that aren't applicable.
Since the symbol file isn't actually needed at this point it's better
to wait with this step until the use cases for it are more clear.

Test: m nothing
Test: Create an SDK snapshot with Bionic libs, drop it into a
  master-art tree without bionic/ in it, build ART APEXes, and check
  that the Soong phase completes (specifically that the stubs are
  detected even without symbol files).
Bug: 152481980
Change-Id: Ic79f89bc6d11d0b6552fa20791f5680ff9a40c0d
2020-04-06 23:03:53 +01:00
David Srbecky
178c0807e7 Merge "Fix dex-location for host." am: c7b02cb523
Change-Id: Ic546d67275de50b7f8c2a4a4fb59c3c5c3673e75
2020-04-06 21:59:51 +00:00
David Srbecky
c7b02cb523 Merge "Fix dex-location for host." 2020-04-06 21:38:16 +00:00
Treehugger Robot
a5417a0450 Merge "Use 0777 instead of FileInfo() for dirs." am: 0ccd73a8df am: aaf126320b
Change-Id: I68b04d7750d928771f5f95624657c9367ad54e69
2020-04-06 21:03:51 +00:00
Treehugger Robot
5369cf771c [automerger skipped] Merge "Use 0777 instead of FileInfo() for dirs." am: 0ccd73a8df am: aaf126320b -s ours
am skip reason: Change-Id Ie9f5320bc44d24b2f9d54d4036bb1747456655bb with SHA-1 4f5edfc43c is in history

Change-Id: I97f640f0c52db4939a3946691384331532531ee8
2020-04-06 21:02:37 +00:00
Treehugger Robot
aaf126320b Merge "Use 0777 instead of FileInfo() for dirs." am: 0ccd73a8df
Change-Id: I22d1c9c17aefe417ffd7185eeec680b4b2a1a612
2020-04-06 20:43:13 +00:00
Treehugger Robot
0ccd73a8df Merge "Use 0777 instead of FileInfo() for dirs." 2020-04-06 20:21:11 +00:00
David Srbecky
0f6fdf5544 Fix dex-location for host.
Fix the location for non-default build output path.

Test: Run host test on golem.
Change-Id: Idbaccfc69196fc0b17a849b4a0c7a54d75fd363d
2020-04-06 18:48:22 +01:00
TreeHugger Robot
e05b7e8631 Merge "Use 0777 instead of FileInfo() for dirs." into rvc-dev am: cd963fc63b
Change-Id: I70d6f7dc751510311b03e245b2189a76b395a49c
2020-04-06 17:44:18 +00:00
Jaewoong Jung
a86983dc7a Use 0777 instead of FileInfo() for dirs.
Golang's FileInfo() implementation recognizes FAT filesystem directories
correctly, but doesn't actually add executable bits, which essentially
makes them inaccessible. Use 0777 when we know we're dealing with
directories.

(This is a cherry-pick change.)

Fixes: 153207404
Test: manually tested with an aar file with FAT permission bits.
Change-Id: Ie9f5320bc44d24b2f9d54d4036bb1747456655bb
Merged-In: Ie9f5320bc44d24b2f9d54d4036bb1747456655bb
2020-04-06 10:41:40 -07:00
TreeHugger Robot
cd963fc63b Merge "Use 0777 instead of FileInfo() for dirs." into rvc-dev 2020-04-06 17:12:11 +00:00
Przemysław Szczepaniak
5642308998 Clean com.android.neuralnetworks APEX whitelist
Test: coral-userdebug build
Bug: 148593574
Change-Id: I1babea6c221dec1cd5364250d09f5ea541494942
Merged-In: I1babea6c221dec1cd5364250d09f5ea541494942
2020-04-06 14:02:31 +00:00
Przemysław Szczepaniak
2bce0e8002 Clean com.android.neuralnetworks APEX whitelist
Test: coral-userdebug build
Bug: 148593574
Change-Id: I1babea6c221dec1cd5364250d09f5ea541494942
Merged-In: I1babea6c221dec1cd5364250d09f5ea541494942
2020-04-06 12:05:53 +00:00
Treehugger Robot
1c2f7f12d1 Merge "Add product_variables.eng.optimize.enabled" am: dd22225b3a am: 27b6f6ed61
Change-Id: Ia5e37a3ea8c44146526bcb734e3153eb8e343327
2020-04-06 04:51:57 +00:00
Treehugger Robot
8dc93312ca Merge "Add product_variables.eng.optimize.enabled" am: dd22225b3a am: 27b6f6ed61
Change-Id: I8995c5f2cfae34ee0fc6eb158ac48e36243e8e64
2020-04-06 04:51:15 +00:00
Treehugger Robot
27b6f6ed61 Merge "Add product_variables.eng.optimize.enabled" am: dd22225b3a
Change-Id: I9c90008ac2e04dcc7053ab2448f8bd79782c5977
2020-04-06 04:26:40 +00:00
Treehugger Robot
dd22225b3a Merge "Add product_variables.eng.optimize.enabled" 2020-04-06 04:09:54 +00:00
Treehugger Robot
d43bbb6806 Merge changes from topic "no_whitelisting_apex_available" am: b9e4a3fdf4 am: bf4bc941a2
Change-Id: I06d0f96a82876e2fec1bdcb26addca821c32a472
2020-04-05 09:52:11 +00:00
Treehugger Robot
678c8de79c Merge changes from topic "no_whitelisting_apex_available" am: b9e4a3fdf4 am: bf4bc941a2
Change-Id: Ife369d5943e70b4d5a6836ca19d514dd1c38d658
2020-04-05 09:51:31 +00:00
Treehugger Robot
bf4bc941a2 Merge changes from topic "no_whitelisting_apex_available" am: b9e4a3fdf4
Change-Id: I333897404cb17d898c086809c7a69ec65f704a9e
2020-04-05 09:31:31 +00:00
Treehugger Robot
b9e4a3fdf4 Merge changes from topic "no_whitelisting_apex_available"
* changes:
  Remove some apex_available whitelist for the adbd APEX
  Make ndk_prebuilt_* be available to any apex
2020-04-05 09:10:47 +00:00
Treehugger Robot
3bc34c2050 Merge "[soong] new field in Android.bp to request APK signing V4" am: ab768cf54b am: 00713a61d9
Change-Id: Ia33492c9fa1940b703146687923f52ff6a22c953
2020-04-05 02:55:03 +00:00
Treehugger Robot
c064ad3476 [automerger skipped] Merge "[soong] new field in Android.bp to request APK signing V4" am: ab768cf54b am: 00713a61d9 -s ours
am skip reason: Change-Id Ie84725a15406f96f65042ea9909460e4eb34d57f with SHA-1 688de9af5d is in history

Change-Id: If0af55d64615bbaea3401643f921bfe8f39bd151
2020-04-05 02:54:22 +00:00
Treehugger Robot
00713a61d9 Merge "[soong] new field in Android.bp to request APK signing V4" am: ab768cf54b
Change-Id: Ic2c64a90919a7b4558fa0873a2d1b80a15033907
2020-04-05 02:33:33 +00:00
Treehugger Robot
ab768cf54b Merge "[soong] new field in Android.bp to request APK signing V4" 2020-04-05 02:14:41 +00:00
Jooyung Han
7e62fbe8e1 Merge "Apex: support codenames for min_sdk_version" into rvc-dev am: 95148f607e
Change-Id: Ib64f83d89dd7adeafa2b42bc81c7dd012fe13ff8
2020-04-05 00:32:30 +00:00
Jooyung Han
95148f607e Merge "Apex: support codenames for min_sdk_version" into rvc-dev 2020-04-05 00:14:37 +00:00
Songchun Fan
17d69e3484 [soong] new field in Android.bp to request APK signing V4
If "v4_signature: true" is set, the v4 signature file,
named [outputApkFile].idsig
will be generated along side the outputApkFile.

Test: m nothing
Test: atest PackageManagerShellCommandIncrementalTest
BUG: 149354175
Change-Id: Ie84725a15406f96f65042ea9909460e4eb34d57f
Merged-In: Ie84725a15406f96f65042ea9909460e4eb34d57f
2020-04-04 12:37:45 -07:00
Stephen Hines
c1de1977a0 Clean up unused flags for LLD.
Since Android only uses LLD, we shouldn't be default adding flags that
just get stripped by a later pass such as:

-Wl,-m,aarch64_elf64_le_vec
-fuse-ld=gold

Remaining query for `-fuse-ld=gold`:
https://source.corp.google.com/search?q=%5C-fuse-ld%3Dgold%20file:.*%5C.(bp%7Cmk%7Cgo)&sq=package:%5Eandroid$
Remaining query for `elf64_le_vec`:
https://source.corp.google.com/search?q=elf64_le_vec%20file:.*%5C.(bp%7Cmk%7Cgo)&sq=package:%5Eandroid$

Bug: http://b/148819762
Test: Built aosp_blueline
Change-Id: I4e064a1e3e0c54721f3f08af8d717f28f6d348f8
2020-04-03 20:18:17 -07:00
Jaewoong Jung
4f5edfc43c Use 0777 instead of FileInfo() for dirs.
Golang's FileInfo() implementation recognizes FAT filesystem directories
correctly, but doesn't actually add executable bits, which essentially
makes them inaccessible. Use 0777 when we know we're dealing with
directories.

Fixes: 153207404
Test: manually tested with an aar file with FAT permission bits.
Change-Id: Ie9f5320bc44d24b2f9d54d4036bb1747456655bb
2020-04-03 19:00:53 -07:00
TreeHugger Robot
8f2c40e7e1 [automerger skipped] Merge "soong_config: bool_variables shortcut" into rvc-dev am: 909eaf5282 -s ours
am skip reason: Change-Id If5455a38433431c7ecbce1e5b32cfbb47f42602a with SHA-1 2b8b89cfa2 is in history

Change-Id: I5c154f09957982fad5eec7a0472c9b97cc83c085
2020-04-03 21:42:32 +00:00
TreeHugger Robot
909eaf5282 Merge "soong_config: bool_variables shortcut" into rvc-dev 2020-04-03 21:27:22 +00:00
Ramy Medhat
4dad69ce48 Merge "Fix RuleBuilder remoteable actions running in the local pool." am: ff6231920d am: 98e8fb4865
Change-Id: I33808d30444656e9ded1814c37c9d6893a6b374a
2020-04-03 21:11:16 +00:00
Ramy Medhat
87790234e8 Merge "Fix RuleBuilder remoteable actions running in the local pool." am: ff6231920d am: 98e8fb4865
Change-Id: If2fe384a51bdff0fa11ca19bb55ab334107c8b80
2020-04-03 21:10:25 +00:00
Ramy Medhat
98e8fb4865 Merge "Fix RuleBuilder remoteable actions running in the local pool." am: ff6231920d
Change-Id: I5d547d6bb6e6a51963ceecc8b0410197f330b8c9
2020-04-03 20:47:54 +00:00
Ramy Medhat
ff6231920d Merge "Fix RuleBuilder remoteable actions running in the local pool." 2020-04-03 20:28:41 +00:00
Treehugger Robot
9af8f186a2 Merge "Minor refactoring to put mock filesystem init closer to tests." am: 3d568ddd34 am: d7be8455c8
Change-Id: I72580dfdacf3694a29747dcf0c40d47d349ed390
2020-04-03 17:29:16 +00:00
Treehugger Robot
5bd176ba95 Merge "Propagate stubs to the SDK for libraries that have them." am: 237690224e am: 77a6c1d43b
Change-Id: If062b2fe63319a87f73ad22dc48ea1e59c80b9af
2020-04-03 17:29:11 +00:00