Commit Graph

1479 Commits

Author SHA1 Message Date
Søren Gjesse
a62cbeefdf Revert "Remove DX from the SDK"
This reverts commit 97c4f4304a.

Reason for revert: Build breakage

Change-Id: I24db691da0ff4bfdf95db611928084486183b3a7
2021-04-19 14:26:56 +00:00
Søren Gjesse
97c4f4304a Remove DX from the SDK
Deprecation and removal of support of DX was announced here:
https://android-developers.googleblog.com/2020/02/the-path-to-dx-deprecation.html.

There is says:

As of On Feb 1st, 2021, we’ll move to step 3, removing DX fully from
Android Studio and any other build environments.

Test: m sdk
Bug: 185479734
Bug: 73711890
Change-Id: I2d7601037ed4135e00cf48b4b9f490a86fec90cb
2021-04-19 13:39:03 +00:00
Roman Kiryanov
67cdcf3f6a Switch the arm64 kernel to gz
Bug: 180497581
Test: boot on M1
Signed-off-by: Roman Kiryanov <rkir@google.com>
Change-Id: Ib8f745a14732c9a5ff665cc70e2ede671b253098
2021-02-17 14:53:13 -08:00
Roman Kiryanov
cc09ceecde Switch to the kernel from kernel/prebuilts
prebuilts/qemu-kernel is deprecated.

Bug: 170677468
Test: presubmit
Signed-off-by: Roman Kiryanov <rkir@google.com>
Change-Id: Ia56718b7bf7d719d4c9cf8d864bb1a9eb7995d82
Merged-In: Ia56718b7bf7d719d4c9cf8d864bb1a9eb7995d82
2021-02-04 14:20:28 -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
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
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
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
bohu
88ccdd300e emulator: use 5.4 for sdk_phone_arm64
4.4 is too old for S. x86 and x86_64
have already switched to 5.4

BUG: 169343095
Change-Id: I8ffc8af22f4be81f99ee9a2a5be42089ada4926c
2020-11-10 20:40:34 +00:00
Anton Hansson
1ed8eb8372 Re-submit "Make sdk depend on merged srcjar instead of monolith"
Bug: 158465496
Test: lunch sdk_phone_armv7; m sdk
Change-Id: I204ff3cc043dbc6d2a5383f87a067fc82caee3db
Merged-In: I204ff3cc043dbc6d2a5383f87a067fc82caee3db
2020-11-10 08:02:58 +00:00
Colin Cross
7ee9fed293 Revert "Make sdk depend on merged srcjar instead of monolith"
This reverts commit 11e2f2ad76.

Reason for revert: b/172663078

Bug: 169034951
Bug: 172663078
Change-Id: If8d432b621d5265d3cec4614ba33439ef5cc75a1
2020-11-06 19:27:22 +00:00
Anton Hansson
11e2f2ad76 Make sdk depend on merged srcjar instead of monolith
Bug: 158465496
Test: lunch sdk_phone_armv7; m sdk
Change-Id: I47b37223a05b9d396c97c3a86d76855b834f7f4a
2020-11-05 21:09:44 +00:00
Treehugger Robot
dc03000e92 Merge "Merge redfin/bramble support." 2020-10-19 23:20:10 +00:00
Joe Baker-Malone
d2ce549b1e Don't include stdlibc++.so in win platform-tools
Test: Manually verified the file is gone.
Bug: none
Change-Id: Ifddeadebac292414a64fa2498c14a1406ed28837
2020-10-19 21:32:03 +00:00
Xin Li
e3b57410da Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)
Bug: 166295507
Merged-In: I37a77cdaf905fe0bf58ad8eebcdff36873aec71a
Change-Id: Idac9218a0e169df9d02d9d8d376a6816315a4b28
2020-08-27 10:16:04 -07:00
Jaegeuk Kim
cb63b3059d Merge "support make_f2fs with casefoling support" am: 0548bafe93 am: b593fa77a1
Original change: https://android-review.googlesource.com/c/platform/development/+/1367738

Change-Id: Ic47ae06cc39a8e1d83b168fb67acc5d18f523b60
2020-08-04 05:10:19 +00:00
Jaegeuk Kim
0548bafe93 Merge "support make_f2fs with casefoling support" 2020-08-04 04:18:07 +00:00
Zhomart Mukhamejanov
5b61ab6f97 Add generated Automotive OS SDK. am: bdb2a60d3e
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/12230897

Change-Id: Ibc767e65b6afdc4e9d8cad872ae9d6c36abf5551
2020-07-29 21:46:49 +00:00
Zhomart Mukhamejanov
bdb2a60d3e Add generated Automotive OS SDK.
- Update old comments in sdk.atree.
- Add README.md with instructions on building sdk.

Test: lunch sdk && m -j sdk
Test: Unzipped and extracted platforms/android-11/optional/android.car.jar
      and verified it with the latest android.car-stubs.jar from
      http://ab/.
Bug: 162442020
Change-Id: I9796fbcecfef5178915008b49d81cda996c66fa2
2020-07-29 20:31:17 +00:00
Zhomart Mukhamejanov
d18b3d9a78 Add Automotive OS API 29 stubs to platform SDK optionals. am: ecf644f2d6 am: 7737e3dc01 am: 683c5ffe37
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/12221485

Change-Id: I29ba637ead31f2466942c54fd26971d4fe8caed9
2020-07-24 21:07:16 +00:00
Zhomart Mukhamejanov
683c5ffe37 Add Automotive OS API 29 stubs to platform SDK optionals. am: ecf644f2d6 am: 7737e3dc01
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/12221485

Change-Id: I4aa6d0cc36fd61557d94a529b9a60f8e905101bb
2020-07-24 20:54:27 +00:00
Zhomart Mukhamejanov
ecf644f2d6 Add Automotive OS API 29 stubs to platform SDK optionals.
Android Automotive OS stubs (android.car-stubs.jar) is used
to compile apps against Car API.

NOTE: We tried using
${OUT_DIR}/target/common/obj/JAVA_LIBRARIES/android.car-stubs_intermediates/classes.jar,
but it doesn't work because car-stubs are not generated when building
regular Android SDK for phones.

Bug: 154653660
Test: m -j
Test: m -j dist
Test: 1. $ ./build/soong/soong_ui.bash --make-mode TARGET_PRODUCT=sdk_phone_armv7 \
             TARGET_BUILD_VARIANT=userdebug win_sdk dist DIST_DIR=dist-mine sdk_repo
      2. Copy and unzip dist-mine/android-sdk_eng.zhomart_windows.zip to
         $HOME/Android/Sdk (replaced the existing Sdk forlder)
      3. Created a sample app, used "android.car.Car" and verified it
         compiles, runs and connects to the car service.
Change-Id: I1913fd89cf1cd702b3b5b3f386cf3693a5042eea
2020-07-23 22:24:13 +00:00
Anton Hansson
86c9aeda24 Merge "Remove unused phonys" am: fa60f334c3 am: 402f771fc8
Original change: https://android-review.googlesource.com/c/platform/development/+/1368457

Change-Id: I6419ed3804c2129b08ae602bef073bd7987e53e6
2020-07-22 19:47:58 +00:00
Anton Hansson
c434b65907 Remove unused phonys
Nothing depends on these.

Test: codesearch android_stubs[^_]
Change-Id: Ic22e3f263c8bb6b23fc443ed8157226073ec474e
2020-07-22 16:21:21 +00:00
Anton Hansson
e7c7f9f280 Remove make-based disting of android stubs
They are being converted to Android.bp-based disting.

Bug: 161214753
Test: diff dist dir after `m sdk dist`
Merged-In: I1af2aac1a354f66ecb9dfa7f2a44af16cdfa647d
Change-Id: I1af2aac1a354f66ecb9dfa7f2a44af16cdfa647d
2020-07-22 16:21:02 +00:00
Anton Hansson
71573ce358 Remove make-based disting of android stubs
They are being converted to Android.bp-based disting.

Bug: 161214753
Test: diff dist dir after `m sdk dist`
Change-Id: I1af2aac1a354f66ecb9dfa7f2a44af16cdfa647d
2020-07-22 08:50:22 +01:00
Jaegeuk Kim
111f87361b support make_f2fs with casefoling support
Bug: 159672232
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
Change-Id: Icfb28a534ebc71ee6575eaddd3c703fcd87cc127
2020-07-20 17:53:40 -07:00
Treehugger Robot
9f073397c3 Merge "dist annotations.zip and api-versions.xml" am: 59d6611224 am: 83a846f398
Original change: https://android-review.googlesource.com/c/platform/development/+/1356106

Change-Id: I243dfb3dd1f7ed3ce3f12f9eb04676bcb493ee35
2020-07-06 20:24:36 +00:00
Colin Cross
0bb7772edc dist annotations.zip and api-versions.xml
Lint in unbundled builds will require annotations.zip and api-versions.xml
in prebuilts/sdk.

Bug: 153485543
Test: forrest
Change-Id: Ice23230c57b9ed30541a6dcb6f507b765e6a03fe
Merged-In: Ice23230c57b9ed30541a6dcb6f507b765e6a03fe
(cherry picked from commit 0c40b60640)
2020-07-06 13:14:27 -07:00
Colin Cross
0c40b60640 dist annotations.zip and api-versions.xml
Lint in unbundled builds will require annotations.zip and api-versions.xml
in prebuilts/sdk.

Bug: 153485543
Test: forrest
Change-Id: Ice23230c57b9ed30541a6dcb6f507b765e6a03fe
2020-07-06 11:20:07 -07:00
Treehugger Robot
54f911f8b2 Merge "Don't use unzip -t when unzip -l will do." am: a803d77648 am: c26bc5cc4f
Change-Id: I36e4532c3030fc22f112c6ecb3d22f26aa1f80ce
2020-05-21 23:16:20 +00:00
Elliott Hughes
ad140286f3 Don't use unzip -t when unzip -l will do.
It's a *lot* more expensive, and ziptool doesn't support it. I can
easily add the functionality, but since our only user seems to be a
mistake, that wouldn't be my first choice!

Test: treehugger
Change-Id: Iab1a326e4cec3520942adaf9f3c9bb424adf4c35
2020-05-21 14:09:24 -07:00
Rico Wind
2a34fb7675 Merge "Revert back to using the default r8 jar for buildtools" am: d19b1fea66 am: 0885f568ce
Change-Id: I0a748f294daddcae894cbe7d9c490b633ed295d1
2020-05-13 10:12:15 +00:00
Rico Wind
34e933850f Revert back to using the default r8 jar for buildtools
We have never actually updated the buildtools version independently of
the normal updates (except updating it to be the same)

If we ever need to update it to a seperate version, that is is easily
accomplished by changing the path.

Bug: b/134507641
Test: m -j55 sdk and run d8 in the sdk zip validating the version
Change-Id: Ib1540b22921e10946ec33076f1db40c50bccac76
2020-05-13 08:45:55 +00:00
bohu
e3c06cb247 emulator: package ramdisk-qemu.img to image zip
BUG: 149826779
Test: build
Change-Id: I7949daa15edafeeb51e80d320bcbb5a450cd0a49
Merged-In: I7949daa15edafeeb51e80d320bcbb5a450cd0a49
2020-05-01 20:01:53 +00:00
David Gross
f7aab5ddfc Place a dummy file at the location of each (previously removed) old GNU linker am: 940757220e
Change-Id: I05de83c6e641cb67ada7dae413ba3c211ab3eec1
2020-04-30 01:42:18 +00:00
David Gross
940757220e Place a dummy file at the location of each (previously removed) old GNU linker
Previously, old GNU linkers were removed, in favor of the LLVM linker
lld.  However, old versions of AGP consider the absence of those linkers
to mean that the build tools are corrupted.  To solve this problem, we
provide a (non-executable) dummy file in place of each old GNU linker to
keep AGP satisfied.  A compatibility mode RenderScript build by those
old versions of AGP will fail (as it would have without the dummy
files), but everything else should work.

Bug: 153685081
Bug: 144040336
Bug: 142590626

Test: (gLinux) m TARGET_PRODUCT=sdk_phone_armv7 TARGET_BUILD_VARIANT=userdebug sdk dist sdk_repo
      (gLinux) m TARGET_PRODUCT=sdk_phone_armv7 TARGET_BUILD_VARIANT=userdebug win_sdk dist sdk_repo
Change-Id: I7574c850bfb593df5bcb9131ea8915061b0083e1
2020-04-29 14:26:10 -07:00
Colin Cross
18b3f5f895 Package core-current-stubs-for-system-modules into the SDK
core-current-stubs-for-system-modules needs to be distributed
in the SDK to allow apps to be built with javac -source 9 -target 9.

Bug: 143209928
Test: m TARGET_PRODUCT=sdk_phone_x86 TARGET_BUILD_VARIANT=userdebug sdk sdk_repo dist
Change-Id: I9d67344f159f9482567323f27c5a8e4e060e1f1a
Merged-In: I9d67344f159f9482567323f27c5a8e4e060e1f1a
(cherry picked from commit 89c5517a28)
2020-04-22 08:59:03 -07:00
Colin Cross
dd5163124e Merge "Package core-current-stubs-for-system-modules into the SDK" am: 56d21f5ebb am: 73e25944a0
Change-Id: I6aeef43fe3e2a4e0a2e5a15fc54c1a600b2923e7
2020-04-21 23:11:35 +00:00
Colin Cross
89c5517a28 Package core-current-stubs-for-system-modules into the SDK
core-current-stubs-for-system-modules needs to be distributed
in the SDK to allow apps to be built with javac -source 9 -target 9.

Bug: 143209928
Test: m TARGET_PRODUCT=sdk_phone_x86 TARGET_BUILD_VARIANT=userdebug sdk sdk_repo dist
Change-Id: I9d67344f159f9482567323f27c5a8e4e060e1f1a
2020-04-17 18:18:18 -07:00
Bo Hu
31fb4ee26e Merge "emulator: package ramdisk-qemu.img to image zip" am: 62b3edb5ea am: 59578569d4
Change-Id: I5f30b663990c0e00b9d5f8fc4c66d47cda17c1d3
2020-04-06 19:52:16 +00:00
bohu
7b21036ee9 emulator: package ramdisk-qemu.img to image zip
BUG: 149826779
Test: build
Change-Id: I7949daa15edafeeb51e80d320bcbb5a450cd0a49
2020-04-06 14:05:54 +00:00
David Gross
058dd79b80 Remove old GNU linkers from SDK.
Linkers aarch64-linux-android-ld and x86_64-linux-android-ld were built
with a minimum macOS deployment target lower than 10.9, so they cannot
be signed and notarized.  Rather than try to produce newer versions of
these linkers (which are obsolete in the SDK anyway), we remove them (so
that all of the SDK can be signed and notarized).  Rather than introduce
an inconsistency among the linkers for a particular host (there are
three other GNU linkers that don't have this problem) or across hosts
(there are no issues on linux or windows), we remove all of the GNU
linkers, not just the two problematic ones.

Only newer gradle plugins (those that look for the clang linker lld)
will work with the new SDK from which those old linkers have been
removed.

Bug: 152337684

Test: (gLinux) m TARGET_PRODUCT=sdk_phone_armv7 TARGET_BUILD_VARIANT=userdebug sdk dist sdk_repo
      (gLinux) m TARGET_PRODUCT=sdk_phone_armv7 TARGET_BUILD_VARIANT=userdebug win_sdk dist sdk_repo
      Inspect sdk-repo-{linux,windows}-build-tools-eng.*.zip
Merged-In: Iccfa870a826de3f12c99175e0761ea00fe2876ed
Change-Id: Iccfa870a826de3f12c99175e0761ea00fe2876ed
(cherry picked from commit cb255acf77)
2020-04-02 15:42:50 -07:00
David Gross
cb255acf77 Remove old GNU linkers from SDK.
Linkers aarch64-linux-android-ld and x86_64-linux-android-ld were built
with a minimum macOS deployment target lower than 10.9, so they cannot
be signed and notarized.  Rather than try to produce newer versions of
these linkers (which are obsolete in the SDK anyway), we remove them (so
that all of the SDK can be signed and notarized).  Rather than introduce
an inconsistency among the linkers for a particular host (there are
three other GNU linkers that don't have this problem) or across hosts
(there are no issues on linux or windows), we remove all of the GNU
linkers, not just the two problematic ones.

Only newer gradle plugins (those that look for the clang linker lld)
will work with the new SDK from which those old linkers have been
removed.

Bug: 152337684

Test: (gLinux) m TARGET_PRODUCT=sdk_phone_armv7 TARGET_BUILD_VARIANT=userdebug sdk dist sdk_repo
      (gLinux) m TARGET_PRODUCT=sdk_phone_armv7 TARGET_BUILD_VARIANT=userdebug win_sdk dist sdk_repo
      Inspect sdk-repo-{linux,windows}-build-tools-eng.*.zip
Change-Id: Iccfa870a826de3f12c99175e0761ea00fe2876ed
2020-03-30 11:08:31 -07:00
Aurimas Liutikas
3219aad274 Move to framework-doc-stubs module for versions xml and annotations
api-versions.xml and annotations.zip will now be taken from framework-doc-stubs
module so that api-stubs-docs can stop generating them.

Test: lunch sdk; make sdk
Bug: 151160048
Change-Id: I35fdba553318098a09249f47d7d78cdef79f3898
Merged-in: I35fdba553318098a09249f47d7d78cdef79f3898
2020-03-23 18:53:17 +00:00
Anton Hansson
858113cdae Add module_lib and system-server artifacts to sdk dist
Makes these artifacts available for the update_prebuilts script.

Bug: 149293194
Test: m win_sdk dist && find out/dist -type f
Change-Id: Icd91da0976f24eb1b4ea1eeaebb96398990f760e
Merged-In: Icd91da0976f24eb1b4ea1eeaebb96398990f760e
(cherry picked from commit b4aca10721)
2020-03-20 15:22:23 +00:00
Anton Hansson
b4aca10721 Add module_lib and system-server artifacts to sdk dist
Makes these artifacts available for the update_prebuilts script.

Bug: 149293194
Test: m win_sdk dist && find out/dist -type f
Change-Id: Icd91da0976f24eb1b4ea1eeaebb96398990f760e
2020-03-19 19:20:32 +00:00
Colin Cross
359ef3d028 Fix lld prebuilts locations
prebuilts/sdk/tools is updated from the zip file built by the SDK.
The lld binaries are copied from the prebuilts to the zip file, and
were moved in the zip file, which meant the next time the prebuilts
were updated the wrong files were copied.

Fixes: 151729229
Test: m TARGET_PRODUCT=sdk_phone_armv7 TARGET_BUILD_VARIANT=userdebug out/host/linux-x86/sdk/sdk_phone_armv7/repo-sys-img.xml sdk sdk_repo
Change-Id: I2de182f3cbf739dbd9c6a5287e1416ea37d2899f
2020-03-17 16:23:55 -07:00
David Gross
460d56ddd1 For darwin, add lib64/libc++abi.1.dylib.
libc++.1.dylib, which was already added, depends on this.

Bug: 148267171
Bug: 142590626
Bug: 144040336
Test: N/A
Merged-In: Ifd5b2db7b18a29c1b58b408118951792733649b7
Change-Id: Ifd5b2db7b18a29c1b58b408118951792733649b7
(cherry picked from commit f879b7a53c)
2020-03-17 14:46:21 -07:00
David Gross
a893a3fa39 Move lld.exe (windows) and add dependent library libwinpthread-1.dll
Move lld.exe to lld-bin directory; add lld-bin/libwinpthread-1.dll; add
trampoline.

Best practice is to ship necessary libraries of expected versions along
with build tools, rather than requiring them to be found elsewhere.

lld.exe depends on libwinpthread-1.dll and windows looks for it in the
same directory as lld.exe.  Unfortunately, there's already a 32-bit
libwinpthread-1.dll at the tool root (used by 32-bit executables at
the tool root), and lld.exe is a 64-bit executable, so it needs its own
directory and its own library.

In the old location of lld.exe, we add a trampoline executable (a build
artifact) in lld-bin; this means Gradle, which invokes lld.exe in the old
location, does not have to change.

Bug: 148267171
Bug: 142590626
Bug: 144040336

Test: (gLinux) m TARGET_PRODUCT=sdk_phone_armv7 TARGET_BUILD_VARIANT=userdebug sdk dist sdk_repo
      (gLinux) m TARGET_PRODUCT=sdk_phone_armv7 TARGET_BUILD_VARIANT=userdebug win_sdk dist sdk_repo

Merged-In: Ice6710ed204a25d09ac596207c02b8b99ca95b8b
Change-Id: Ice6710ed204a25d09ac596207c02b8b99ca95b8b
(cherry picked from commit 24e52959d7)
2020-03-17 13:45:39 -07:00