Commit Graph

29810 Commits

Author SHA1 Message Date
Treehugger Robot
e55e094041 Merge "Use vndk.private: true for VNDK-private libs" 2021-01-05 10:23:02 +00:00
Justin Yun
70e152e377 Use vndk.private: true for VNDK-private libs
Instead of using `vendor_available: false`, use `vndk.private: true`
for VNDK-private libraries.

Bug: 175768895
Test: build
Change-Id: I1ba8e25d232e839e1144bf0649981305e7f4f6ea
2021-01-05 17:10:37 +09:00
Alex Light
a8f224d606 lldb-vscode
Add support for using lldb with vscode.

Test: lldbclient.py --setup-forwarding vscode -r dalvikvm
Bug: 176158605

Change-Id: I92a08b3b02a27a14be586582fe57acdd670a9ada
2020-12-28 11:30:39 -08:00
Colin Cross
b9d10f8d7c Include 64-bit version of libaapt2_jni.dll in windows SDK
AAPT2 can be invoked through JNI by loading the libaapt2_jni.dll library
in the JVM.  Provide a 64-bit version of libaapt2_jni.dll for 64-bit
JVMs.

Fixes: 150355628
Test: manually inspect sdk-repo-windows-build-tools-*.zip
Change-Id: Iebf1ded45d0c2901f0f3905f2b37a8801c378a4e
2020-12-22 16:34:13 -08:00
Treehugger Robot
8a1baea811 Merge "Switch emulator to 5.10 kernel (GKI 2.0)" am: 89e83dc8ec am: cad76386c4
Original change: https://android-review.googlesource.com/c/platform/development/+/1534263

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3efdf9a5c98f5d0bf3607c2ae7e2a7ec22d922a6
2020-12-22 03:27:26 +00:00
Treehugger Robot
cad76386c4 Merge "Switch emulator to 5.10 kernel (GKI 2.0)" am: 89e83dc8ec
Original change: https://android-review.googlesource.com/c/platform/development/+/1534263

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I61aed680909a2f17ad8a912f76dd6ffe1fc6b455
2020-12-22 03:05:42 +00:00
Treehugger Robot
89e83dc8ec Merge "Switch emulator to 5.10 kernel (GKI 2.0)" 2020-12-22 02:39:42 +00:00
Roman Kiryanov
f396f3e1d4 Switch emulator to 5.10 kernel (GKI 2.0)
Bug: 175707513
Bug: 170560077
Test: presubmit
Signed-off-by: Roman Kiryanov <rkir@google.com>
Change-Id: I1470ca760cc453e2a87bd316b46c86270a2928b4
Merged-In: I1470ca760cc453e2a87bd316b46c86270a2928b4
2020-12-21 16:49:09 -08:00
Jose Galmes
0bee2161c0 Support for recovery snapshot.
Bug: 171231437
Test: source build/envsetup.sh
Test: ALLOW_MISSING_DEPENDENCIES=true m -j nothing
Change-Id: I91c9529e858aa61e985a6fa7c1cb3fe296a4e46f
2020-12-16 07:46:45 -08:00
Ivan Lozano
0c057ade57 rust: Use rust_ffi for Rust generated C libraries.
We no longer have the rust_library_shared and rust_library_static module
types. They've been renamed to rust_ffi_* instead. This brings
cargo2android.py up to date.

Bug: 175155132
Test: cargo2android's Android.bp for libquiche contains rust_ffi modules
Change-Id: I01bb8b4e56c41d36481ffd363f96aecb770d7cb8
2020-12-15 10:41:26 -05:00
Xin Li
5c73d2ce31 [automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: 223d9273bb -s ours am: ab5332ac88 -s ours
am skip reason: Change-Id I4fa07b3ba54d994e87a5fa67e9f4e5a0d4d4b28c with SHA-1 93c88fecf0 is in history

Original change: https://android-review.googlesource.com/c/platform/development/+/1520839

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I454789fb917ff40602045aef4a6a6bcc2401e291
2020-12-10 03:46:51 +00:00
Xin Li
ab5332ac88 [automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: 223d9273bb -s ours
am skip reason: Change-Id I4fa07b3ba54d994e87a5fa67e9f4e5a0d4d4b28c with SHA-1 93c88fecf0 is in history

Original change: https://android-review.googlesource.com/c/platform/development/+/1520839

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib32296dffb857ae08f59339c07eafd9e7947d8f1
2020-12-10 03:05:10 +00:00
Xin Li
223d9273bb Merge "DO NOT MERGE - Merge Android R QPR1" 2020-12-10 02:18:23 +00:00
Xin Li
7477542380 DO NOT MERGE - Merge Android R QPR1
Bug: 172690556
Merged-In: I4fa07b3ba54d994e87a5fa67e9f4e5a0d4d4b28c
Change-Id: I3c36c5cd1bbc665fb845f95b9cdc5a0655ee8bb5
2020-12-09 17:44:02 -08:00
Christopher Ferris
6c0757049d Merge "Remove gcc tools from script." am: 013ae32471 am: 93c88fecf0
Original change: https://android-review.googlesource.com/c/platform/development/+/1522497

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I741896ade6542a417fe925b425970d41ba9e9471
2020-12-10 01:13:59 +00:00
Christopher Ferris
93c88fecf0 Merge "Remove gcc tools from script." am: 013ae32471
Original change: https://android-review.googlesource.com/c/platform/development/+/1522497

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4fa07b3ba54d994e87a5fa67e9f4e5a0d4d4b28c
2020-12-10 00:59:14 +00:00
Christopher Ferris
013ae32471 Merge "Remove gcc tools from script." 2020-12-10 00:24:36 +00:00
Christopher Ferris
49eda0e908 Remove gcc tools from script.
Replace all references to gcc tools with llvm tools. This change still
uses c++filt until llvm-cxxfilt is put in the prebuilts.

Test: Ran a backtrace through this script and the old script and verified
Test: no major differences.
Test: Ran unittests for symbol.py and stack_core.py.
Change-Id: Ic31c1a0707dae11c5037f9637943cd7932badf46
2020-12-09 14:34:01 -08:00
Treehugger Robot
0fb789cad3 Merge "cargo2android: map fuse crate in crosvm to libfuse_rust" am: 0c4a338b68 am: 9d41fd23cf
Original change: https://android-review.googlesource.com/c/platform/development/+/1518360

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9826dfecea9a273de94abb3298fb6b0250f8d09b
2020-12-08 22:47:33 +00:00
Treehugger Robot
9d41fd23cf Merge "cargo2android: map fuse crate in crosvm to libfuse_rust" am: 0c4a338b68
Original change: https://android-review.googlesource.com/c/platform/development/+/1518360

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibc0606fdd1597ee1b658894927a7ac66e3a02dca
2020-12-08 22:08:59 +00:00
Treehugger Robot
0c4a338b68 Merge "cargo2android: map fuse crate in crosvm to libfuse_rust" 2020-12-08 21:38:31 +00:00
Xin Li
e78a390aff DO NOT MERGE - Merge RQ1A.201205.011 am: 2324b78a22
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/13177017

Change-Id: I85d53a98d8267501d25b80663708cff98009021f
2020-12-07 17:31:31 +00:00
Xin Li
2324b78a22 DO NOT MERGE - Merge RQ1A.201205.011
Bug: 172690556
Merged-In: I025c0d96e77b7355baddac935779c6b27f3042e3
Change-Id: I22fee72738abe8efa77c138e1f85d6c08e8310d5
2020-12-07 00:39:38 -08:00
Xin Li
349c2726c5 DO NOT MERGE - Mark RQ1A.201004.001 as merged am: 4a0d0a4fc8
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/13176161

Change-Id: Ic6d850340a6eed299215f8cf4774cb1277f87e1c
2020-12-07 04:01:19 +00:00
Xin Li
4a0d0a4fc8 DO NOT MERGE - Mark RQ1A.201004.001 as merged
Bug: 172690556
Change-Id: I76bd12f2fcf39c3534961c2c59bec6a9ef6c833f
2020-12-06 14:43:19 -08:00
Victor Hsieh
21bea79f5a cargo2android: map fuse crate in crosvm to libfuse_rust
Test: run cargo2android in external/crosvm/fuse and build
Bug: 174797066
Change-Id: I32d092818164d422e263c10f8bf5b7b50971a515
2020-12-04 11:00:46 -08:00
Steven Moreland
5198cfcd3c Merge "sdk.atree += libbinder_ndk C++ helpers" am: e67994f74f am: b91f558c94
Original change: https://android-review.googlesource.com/c/platform/development/+/1514875

Change-Id: Iaddda26261732dab5ad1296017c2cd55ccbee19e
2020-12-01 18:14:55 +00:00
Steven Moreland
b91f558c94 Merge "sdk.atree += libbinder_ndk C++ helpers" am: e67994f74f
Original change: https://android-review.googlesource.com/c/platform/development/+/1514875

Change-Id: Ibb249a4bb31e10edb50d76582005e45af1762404
2020-12-01 17:45:04 +00:00
Steven Moreland
e67994f74f Merge "sdk.atree += libbinder_ndk C++ helpers" 2020-12-01 17:09:22 +00:00
Steven Moreland
ed78a1f664 sdk.atree += libbinder_ndk C++ helpers
libbinder_ndk includes a set of C++ headers which are for all practical
purposes coupled with the AIDL compiler. Since NDK and SDK releases do
not line up, and some developers are known to use even old versions of
the SDK with the newest NDK, subtle C++ changes to this library may
break compatibility with the aidl compiler.

Both to reduce the possibility we accidentally break developers as well
as increase the types of changes that can be made, the plan is to always
ship libbinder_ndk C++ headers alongside AIDL.

In the future, this will come with a removal of these headers from the
NDK (with error messages pointing developers to use the version that is
built and tested with their version of aidl).

Bug: 160624671
Test: 'm sdk' and verify contents in out/host/*/sdk/sdk/**
Change-Id: I6dcdfce5314863663548f0a4523df6e96448ee23
2020-12-01 01:28:48 +00:00
Treehugger Robot
544170e29c Merge "Auto generate prebuilt libs for vndk snapshot v28" am: 3c909d817e am: 3e7624959a
Original change: https://android-review.googlesource.com/c/platform/development/+/1512664

Change-Id: I4a26d84f695896cc6ea5bc697b554216a8a22c41
2020-12-01 00:57:38 +00:00
Treehugger Robot
3e7624959a Merge "Auto generate prebuilt libs for vndk snapshot v28" am: 3c909d817e
Original change: https://android-review.googlesource.com/c/platform/development/+/1512664

Change-Id: Ie9ceec03277b5ac945f01d4b5bbdcd7ab0101fa5
2020-12-01 00:13:30 +00:00
Treehugger Robot
3c909d817e Merge "Auto generate prebuilt libs for vndk snapshot v28" 2020-11-30 23:43:49 +00:00
Treehugger Robot
a3057e5d7d Merge "Add product_available to VNDK snapshots" am: 7e8fcca44e am: f5972653c8
Original change: https://android-review.googlesource.com/c/platform/development/+/1512737

Change-Id: I82c4a74e47d2fc711a669c1574fb645ed2ba5ef1
2020-11-30 09:33:14 +00:00
Treehugger Robot
f5972653c8 Merge "Add product_available to VNDK snapshots" am: 7e8fcca44e
Original change: https://android-review.googlesource.com/c/platform/development/+/1512737

Change-Id: I58a0872da89462288ca0ddd861e3092fe311ce98
2020-11-30 09:19:52 +00:00
Justin Yun
1aad56ceac Auto generate prebuilt libs for vndk snapshot v28
For VNDK v28, auto generate the prebuilt_library modules of
libprotobuf-cpp-* that are required for the vendor compatibility to
build the vendor modules that are still using the old version of
libprotobuf-cpp libraries.

Bug: 142220143
Test: python3 development/vndk/snapshot/update.py \
      --local {snapshot_dir} --use-current-branch -vv 28
Change-Id: I28be3bcca31ebd078b59684eeb762809c15a7f99
2020-11-30 08:58:06 +00:00
Treehugger Robot
7e8fcca44e Merge "Add product_available to VNDK snapshots" 2020-11-30 08:49:16 +00:00
Justin Yun
ba2a7e18f8 Add product_available to VNDK snapshots
Using vndkproduct.libraries.txt, add 'product_available' property to
the selected VNDK libraries. If the snapshot does not have
vndkproduct.libraries.txt, create an empty list file and make all
snapshot libraries available to product.

Bug: 174323911
Bug: 150902910
Test: run update.py for various snapshot versions
Change-Id: I3f680abcbf73e3f74c5dad49f57e02de4d87a148
2020-11-30 07:33:30 +00:00
Treehugger Robot
915fdf4251 Merge "Deprecate VNDK v27" am: aa9127dce6 am: 72d22089c1
Original change: https://android-review.googlesource.com/c/platform/development/+/1512663

Change-Id: I5b378f3e0af4b7199c6cb8b120b04536e1276429
2020-11-30 03:50:33 +00:00
Treehugger Robot
72d22089c1 Merge "Deprecate VNDK v27" am: aa9127dce6
Original change: https://android-review.googlesource.com/c/platform/development/+/1512663

Change-Id: I3c886ed5df00804e721e41af23fbdef94e9145e3
2020-11-30 03:28:44 +00:00
Treehugger Robot
aa9127dce6 Merge "Deprecate VNDK v27" 2020-11-30 03:06:24 +00:00
Justin Yun
ef95d09076 Deprecate VNDK v27
Remove the code for old VNDK snapshot v27. The script also checks the
minimum VNDK version it supports.

Bug: 159433338
Test: python3 development/vndk/snapshot/update.py \
      --local {snapshot_dir} --use-current-branch -vv 27
Change-Id: I00587ab3e6c97df7d43e81aaa8795042f89aaf3e
2020-11-30 10:19:43 +09:00
Xin Li
f1e637e802 Mark ab/6881855 as merged am: 3c9377171d
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/13111883

Change-Id: I519fdcb1148e0d374f4f8145512ecda5a0dc37da
2020-11-24 00:10:19 +00:00
Xin Li
3c9377171d Mark ab/6881855 as merged
Bug: 172690556
Change-Id: Ibfbd55f16eadd4e2ff2a205736b1591b40741507
2020-11-23 11:27:12 -08:00
Treehugger Robot
d71a532082 Merge "emulator: packing encryptionkey.img for sdk_phone_arm64" am: 78ba0d950f am: c5fe1428ad am: 3d8011dde6
Original change: https://android-review.googlesource.com/c/platform/development/+/1496996

Change-Id: If946d29d37617dcd21e67471f56a7fbf78fcf2e1
2020-11-12 01:22:36 +00:00
Treehugger Robot
3d8011dde6 Merge "emulator: packing encryptionkey.img for sdk_phone_arm64" am: 78ba0d950f am: c5fe1428ad
Original change: https://android-review.googlesource.com/c/platform/development/+/1496996

Change-Id: I836867cf132978a933284d4eb933ab3237e88095
2020-11-12 00:54:42 +00:00
Treehugger Robot
c5fe1428ad Merge "emulator: packing encryptionkey.img for sdk_phone_arm64" am: 78ba0d950f
Original change: https://android-review.googlesource.com/c/platform/development/+/1496996

Change-Id: I171a576f6146e1821cff3bcfabd3dfb191734a39
2020-11-12 00:40:08 +00:00
Treehugger Robot
78ba0d950f Merge "emulator: packing encryptionkey.img for sdk_phone_arm64" 2020-11-12 00:27:13 +00:00
bohu
cd46a31b56 emulator: packing encryptionkey.img for sdk_phone_arm64
This is needed as metadata and data encryption are both
turned on for sdk_phone_arm64 already

BUG: 169343095

Change-Id: I4ef2249d01720d516c68751495b66623ad2ba993
2020-11-11 21:13:35 +00:00
Treehugger Robot
dcad92c65a Merge "emulator: use 5.4 for sdk_phone_arm64" am: 9fe3e4f5b2 am: db1c1eee8f am: ae2eebd8be
Original change: https://android-review.googlesource.com/c/platform/development/+/1494658

Change-Id: I5bba9e752183d83b33bb9ba61bfaaf3c1d845860
2020-11-11 00:03:34 +00:00