Commit Graph

1501 Commits

Author SHA1 Message Date
Anton Hansson
1d75c7fe31 Use lint database from api_versions_public
These two databases are (nearly) identical but the latter is generated
in a much more efficient way.

The diffs are very minor and it's not clear to me which versions is more
correct than the other, though I'm fairly confident they don't matter.

https://paste.googleplex.com/5567994005553152

Bug: 187398174
Test: diff api-versions.xml
Change-Id: I97375e0d72675bc8ff102551b3e3913e684be683
2022-05-09 10:46:38 +00:00
Anton Hansson
1710a2efc7 Remove non-existing dependency
We have removed the system-images sdk zip, so remove the tracking of it
as a dependency for the addon.

Bug: 205008975
Test: presubmit
Change-Id: I14e47d6418f355c6c7db7444a25c3030f36a3f92
2022-04-27 15:41:13 +00:00
Anton Hansson
ae04c5c358 Remove system-images files from the SDK
The system images distributed externally are created by a separate
set of rules than these. There are no known consumers of these
legacy system-image files.

This makes the SDK zip architecture-agnostic.

Bug: 205008975
Test: m sdk sdk_repo dist
Test: diff sdk zips from sdk_phone_arm64 and sdk_phone_x86 (no diff)
Change-Id: I7ba2eb244a5930721c82895cd2947a1d2aff63e2
2022-04-25 16:28:03 +01:00
Anton Hansson
897fe05053 Stop building the system-image zip
The system images distributed externally are created by a separate
set of rules than these. There are no known consumers of these
legacy system-image zip files.

Bug: 205008975
Test: m sdk sdk_repo dist
Change-Id: I11a9aaea89c307d4698787e228fb47228244ab74
2022-04-25 16:24:33 +01:00
Hector Dearman
03f2a0c5e6 Merge "Stop including systrace in platform tools" 2022-02-28 09:55:06 +00:00
Anton Hansson
3d6f96446a Remove references to win_sdk
This goal doesn't exist anymore. The build system automatically
translates it to "sdk".

Test: m win_sdk dist && inspect out/dist/apistubs
Change-Id: Iebe902b44cbdc76e62d38617ae549ef1c0cdf729
2022-01-04 09:11:17 +00:00
Hector Dearman
647dbdf1c3 Stop including systrace in platform tools
Test: make
Bug: 197867654
Change-Id: I64098266413449ca9265838f617cc3d66f98bb5c
2021-12-08 17:16:42 +00:00
Bob Badour
665239b180 [LSC] Add LOCAL_LICENSE_KINDS to development
Added SPDX-license-identifier-Apache-2.0 to:
  apps/OBJViewer/Android.bp
  build/Android.bp
  samples/HeavyWeight/Android.bp
  samples/MySampleRss/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all
Change-Id: Ifea680956185592ef0d06e29201da596451b3996
2021-10-20 14:13:22 -07:00
Anton Hansson
ed19ee5981 Merge "Use generated merged annotations.zip in SDK build" 2021-10-18 09:54:05 +00:00
Dan Willemsen
836f968022 Remove sdk-linux-x86.atree as well
I missed this one in my last change.

Bug: 187222815
change-Id: Ibd2951f5b8d193295047a00bde2db21d81dabb89
2021-10-16 16:52:07 -07:00
Dan Willemsen
53052e34be Remove old build-tools/platform-tools implementation
These packages are now built with Soong. Since they were the only two
outputs of the windows SDK package, I've also removed that
implementation.

Bug: 187222815
Change-Id: Ib42687cfe79c40066a49d20980a0f6f75914406a
2021-10-15 13:39:11 -07:00
Anton Hansson
2918f63267 Use generated merged annotations.zip in SDK build
The framework-doc-stubs is being transitioned to use module jar stub
source as input, at which point it will stop producing correct
annotations.zip files. Replace the annotations zip file in the sdk
with the one generated from all the constituent parts.

Bug: 187397779
Test: diff sdk.zip before && after (only whitespace diffs in annotations)
Change-Id: I56b22bf4909105a2720221c8de35b517a6e66a3c
2021-10-15 14:50:56 +01:00
Dan Willemsen
17df46e334 Add Android.bp-based definitions for host sdk-repos
So that these can be built independently from the large sdk zip. The old
Make-based implementation created this as part of the large sdk zip,
then extracted it from that zip file.

This topic only adds the new definitions under a different filename,
full replacement will come in a follow-on CL.

Once we fully transitions to this mechanism, we'll be able to turn down
most modules on Macs, only building these and their dependencies.

Bug: 187222815
Change-Id: If6be8dd573a323ef8b343bc86116ffa3d43922a5
2021-10-12 20:45:15 -07:00
Colin Cross
8e7a1df497 Merge "Remove mainDexClasses from the SDK" 2021-09-17 21:57:23 +00:00
Dan Willemsen
ea69f2a8ca Stop disting the monolithic Windows SDK
Since this artifact will no longer be needed shortly when the
build-tools and platform-tools sdk_repo builds are refactored not to use
it as an input.

This will save artifact space and provide an early warning in case
anyone is depending on this artifact.

Bug: 187222815
Change-Id: Ia61c8d1d675b6a64cb46c71f47528e1dd6f7bb71
2021-09-16 15:00:25 -07:00
Colin Cross
17a74a9d94 Remove mainDexClasses from the SDK
dx has already been removed, and mainDexClasses is not needed with d8.

Test: SDK builds
Change-Id: If3a0ccc1b2b453eb2b1cc9e248383265e1c74588
2021-09-16 14:18:34 -07:00
Anton Hansson
b6edd7aa51 Add sdk extension version info to prop templates
This adds two new properties alongside AndroidVersion.ApiLevel:
- AndroidVersion.ExtensionLevel: The sdk extension version if the SDK
- AndroidVersion.IsBaseSdk: Whether the extension level is the the one
  that the ApiLevel shipped with (true), or if is an extension SDK
  release (false).

While we're here, dedupe the recipe that processes these templates.

Bug: 195281582
Test: m out/host/linux-x86/development/sdk/platform_source.properties
      and inspect the substitution is working
Merged-In: Ieea20731aed2e0f35bbe4cfd8ca596cf11f4b3bc
Change-Id: Ieea20731aed2e0f35bbe4cfd8ca596cf11f4b3bc
2021-08-26 17:11:15 +01:00
Dan Willemsen
7a0a133eba Stop relying on /usr/bin/python for SDK builds
Instead, use python2 from $PATH, which will be a prebuilt inside the
build system.

Test: treehugger
Change-Id: I81966e85377c8e9dd87e1f2656f6c0ec6b3a636c
2021-08-05 17:14:01 -07:00
Treehugger Robot
953a521c54 Merge "Add systemapi version of api-versions.xml and annotations.zip to dist." 2021-07-12 21:18:18 +00:00
satayev
80819a2460 Add systemapi version of api-versions.xml and annotations.zip to dist.
Bug: 190665366
Test: lunch sdk; m sdk dist; and inspect out/dist/system-data/api-versions.xml
Change-Id: If2eca5c63866d24fb46a6929222ed43a94d9bc23
2021-07-12 21:09:05 +01:00
Dan Willemsen
477b1e30ef Remove legacy platform API files from platform-tools
We'll be unable to create these files in the Mac builds going forwards,
so just remove these files that were moved to the platform-specific dirs
four years ago.

Bug: 187222815
Test: treehugger
Change-Id: Ie1997782c2e6c692c45578116d4d71deb1986ed7
2021-07-09 00:56:17 +00:00
Søren Gjesse
005a6f340f 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
Test: m win_sdk
Bug: 185479734
Bug: 73711890

Change-Id: I2fdbab7ce7ab50a637baf523ae5c2e87ab01fb8c
2021-04-20 16:55:43 +00:00
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