Commit Graph

1534 Commits

Author SHA1 Message Date
Jihoon Kang
0ae8fe1032 Utilize from-text stub module in build
Replace `android_stubs_current` with `android_from_text_stubs_current`,
a java_api_library module that creates from-text stubs. This feature is
hidden behind a flag `--build-from-text-stub`, which sets the env var
`ANDROID_PUBLIC_STUBS` as `android_from_text_stubs_current`.

Test: m --build-from-text-stub
Bug: 271154441
Change-Id: I06be32d9b7b9a54c0384010457406cabfff98c61
2023-03-27 18:04:34 +00:00
Henri Chataing
8a56e6ca8f Remove AndroidBeamDemo from samples
Bug: 265394596
Test: m sdk
Change-Id: I54898705900f73c55d9a2eb3ee1372f510b15fe2
Merged-In: I54898705900f73c55d9a2eb3ee1372f510b15fe2
(cherry picked from commit e1f18b0234)
2023-03-22 01:59:29 +00:00
Yi Kong
a7b120e3b2 Merge "Revert "Migrate to the new clang lib dir"" am: 05c9290c30
Original change: https://android-review.googlesource.com/c/platform/development/+/2439794

Change-Id: I304799c8592695fc47555a28ac54a951e3cac10c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-16 08:12:58 +00:00
Yi Kong
f1995f429c Revert "Migrate to the new clang lib dir"
This reverts commit b9e03c4fae.

This is properly fixed by https://r.android.com/2439693.

Change-Id: I3950cb4f6c45bad56b1cd4b143e28067a462f783
2023-02-16 07:41:51 +00:00
Yi Kong
792e644ad0 Merge "Migrate to the new clang lib dir" am: b1785dc0a8
Original change: https://android-review.googlesource.com/c/platform/development/+/2437177

Change-Id: Ia0b859b449a8ec4cd684fe684536e0c424d809ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-15 09:16:21 +00:00
Yi Kong
b9e03c4fae Migrate to the new clang lib dir
Test: presubmit
Bug: 218706358
Change-Id: I010d1a6d51c42148a5f485fea1f8cb8cfad2e834
2023-02-15 16:59:01 +09:00
Paul Duffin
88a3a2bf9b Always use prebuilt version of core-lambda-stubs in build-tools am: e52040b4a0 am: ff8ff13b53 am: 082182d3de
Original change: https://googleplex-android-review.googlesource.com/c/platform/development/+/20579490

Change-Id: Idbb1023a7e1246c2de54929082d1c8fe18a8fad5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-13 20:31:17 +00:00
Paul Duffin
e52040b4a0 Always use prebuilt version of core-lambda-stubs in build-tools
Bug: 237299698
Test: build/soong/soong_ui.bash --make-mode TARGET_PRODUCT=sdk TARGET_BUILD_VARIANT=userdebug sdk-repo-build-tools
      # When ran before this change the resulting zip files contains
      # a core-lambda-stubs.jar that is built from sources.
      # When ran after this change the resulting zip files contains
      # a core-lambda-stubs.jar that is built from prebuilts.
Change-Id: I9507eb785bca0fb929dbb587caf0b26455ec9480
2022-11-25 17:59:10 +00:00
Paul Lawrence
9b3ab88730 Revert "Remove renderscript related samples"
This reverts commit 7c7f0903b6.

Reason for revert: aosp-master sdk build is broken by this change
Bug: 258238947
Test: ACA has successfully verified the above culprit
Change-Id: I6a6ea4778f72e09780a04e062ec3b664aee2001f
2022-11-08 20:43:51 +00:00
Mao Han
7c7f0903b6 Remove renderscript related samples
Change-Id: Ieda294eae9febe304c3d15bd0207c3d3aad71c3c
2022-11-08 00:21:56 +00:00
Elliott Hughes
cbb1cbc777 Remove renderscript samples.
Renderscript is deprecated and scheduled for removal. Let's start by
removing the easiest part to remove.

Test: treehugger
Change-Id: I5f172497756c3931ccfda742e9c08bde56b362c9
2022-11-02 16:56:36 +00:00
Cole Faust
d01c3b26d1 Dist the module-lib and system-server lint databases
So that they can be downloaded to prebuilts/sdk.

Bug: 193460475
Test: m sdk dist
Change-Id: I0018256221c994b1b7070bab13a45e5067df1c2a
2022-10-06 13:40:11 -07:00
Bob Badour
4964db9772 Revert "Revert "Add license metadata to non-module targets.""
This reverts commit 696b533ad7.

Bug: 240149934

Test: m droid dist

Test: build/soong/soong_ui.bash --make-mode TARGET_PRODUCT=sdk TARGET_BUILD_VARIANT=userdebug sdk dist sdk_repo

Change-Id: I1902bac43ab3a8337b344983df7b72f5f6c7ec76
2022-09-12 19:51:45 -07:00
Bob Badour
e541ed3b16 Merge "Revert "Add license metadata to non-module targets."" 2022-09-13 00:54:30 +00:00
Bob Badour
696b533ad7 Revert "Add license metadata to non-module targets."
This reverts commit 846c5acd90.

Reason for revert: breaks sdk target on aosp-master

Change-Id: Iea8f2c676533e61a5bea06d17719fea630340b20
2022-09-13 00:52:29 +00:00
Thiébaud Weksteen
0c211bf161 Merge "Remove e2fsdroid and sload_f2fs from platform sdk" 2022-09-12 23:51:31 +00:00
Bob Badour
846c5acd90 Add license metadata to non-module targets.
Bug: 240149934

Test: m droid dist

Change-Id: I2228a9e3b347eb5db97ab776098a563567a5ac2c
2022-09-09 16:54:13 -07:00
Thiébaud Weksteen
f492b84da3 Remove e2fsdroid and sload_f2fs from platform sdk
fastboot used to reference these binaries as an option to populate newly
created filesystem. This option was not reachable from the command line
and was removed (commit 5d72d6c). Remove the unused binaries from the
platform sdk. These are still included in AOSP and can be built using
the regular platform build process [1].

[1] https://source.android.com/setup/build/building

Bug: 237960487
Test: m sdk
Change-Id: I1037c9e1ac7f76473a95676b93eb433fc37484e6
2022-08-12 11:54:24 +10:00
Xin Li
33c6138be7 Merge tm-dev-plus-aosp-without-vendor@8763363
Bug: 236760014
Merged-In: I794bcb9e9c922c642c3fbf0808fb60de4445ab65
Change-Id: Id292c36692b0020d772dc61b863f9cd3b39fe0c5
2022-06-27 23:37:25 +00:00
Anton Hansson
8e63be9278 Dist merged system annotation zip
The system-data/annotations.zip was previously generated
by the monolithic system sdk rule. Migrate it over to the
newly introduced modularized/merged target.

Bug: 235140934
Test: m sdk dist && ls out/dist/system-data | grep annotations
Change-Id: I1afc4ef7fdf87555adecdb11296bc07d25193ca2
2022-06-23 10:14:39 +00:00
Anton Hansson
5708cfea1c 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
Merged-In: I14e47d6418f355c6c7db7444a25c3030f36a3f92
Change-Id: I14e47d6418f355c6c7db7444a25c3030f36a3f92
2022-05-25 13:16:11 +00:00
Anton Hansson
c92fe23901 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)
Merged-In: I7ba2eb244a5930721c82895cd2947a1d2aff63e2
Change-Id: I7ba2eb244a5930721c82895cd2947a1d2aff63e2
2022-05-25 13:16:10 +00:00
Anton Hansson
dd5a6d5c95 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
Merged-In: I11a9aaea89c307d4698787e228fb47228244ab74
Change-Id: I11a9aaea89c307d4698787e228fb47228244ab74
2022-05-25 13:16:07 +00:00
Anton Hansson
664f937fc6 Merge "Use lint database from api_versions_public" am: 4f9305a51c am: 0f1b793d59
Original change: https://android-review.googlesource.com/c/platform/development/+/2092064

Change-Id: I1fa57fb66e062e8ae9c37275fb20b4eb914b195b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-11 20:48:08 +00:00
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
8c04703d5e Merge "Remove non-existing dependency" am: 1db78504aa am: 2859fabd5e
Original change: https://android-review.googlesource.com/c/platform/development/+/2077461

Change-Id: Ife48bc85af5b144dc5b507fdb91963f963d4e8c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 13:49:28 +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
6ce4d57966 Merge changes from topic "sdksys" am: 0a264aa980 am: 460b007629
Original change: https://android-review.googlesource.com/c/platform/development/+/2073609

Change-Id: I393b01c1bc573a4a3a986fdbe73d4a3c2ef84ff2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 11:36:22 +00:00
Anton Hansson
f47e5a94b1 Stop building the system-image zip am: 897fe05053 am: 7764ce3cb6
Original change: https://android-review.googlesource.com/c/platform/development/+/2073608

Change-Id: Ia0f9f2c544a94ffbe1389ed26279c9b377a6268a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 11:36:18 +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
e5d692bd20 Merge "Stop including systrace in platform tools" am: 03f2a0c5e6 am: 451e52f8bb am: f08642b355
Original change: https://android-review.googlesource.com/c/platform/development/+/1914938

Change-Id: Ifdbfca47ba029a56015062c8ff7cd54282d2c070
2022-02-28 10:59:30 +00:00
Hector Dearman
03f2a0c5e6 Merge "Stop including systrace in platform tools" 2022-02-28 09:55:06 +00:00
Anton Hansson
2f2801b1f8 Merge "Remove references to win_sdk" am: 65b493960f am: d5395d93a4 am: 2e8c595080 am: 247624e6d6
Original change: https://android-review.googlesource.com/c/platform/development/+/1936081

Change-Id: I728a983d92cd826e10b7ff02e94cc4e2a89cb179
2022-01-05 19:40:52 +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
Felka Chang
43856d20a3 Revert^2 "Remove the reference of libaapt2_jni in build file"
46fe10698b

Change-Id: I8c27cfdfacd29757c53533690c8d3cbb4e03bee4
2021-11-02 00:57:46 +00:00
Prateek Shrivastava
46fe10698b Revert "Remove the reference of libaapt2_jni in build file"
Revert submission 16102170-remove_libaapt2_jni

Reason for revert: b/204805075 breakages on git_master - BuildMonitor
Reverted Changes:
I2331fcac1:Remove the reference of libaapt2_jni in build file...
I193ff8b5b:Remove the implementation of libaapt2_jni in build...

Change-Id: I47484311fb5d12c9c6b979b701f623bb017d6657
2021-11-01 23:49:52 +00:00
Felka Chang
e289fe6790 Remove the reference of libaapt2_jni in build file
libaapt2_jni is ready to phase out. build-tools includes
libaapt2_jni. However, there is no usage of libaapt2_jni
in AOSP so this patch removes the reference of libaapt2_jni.

Test: make

Test: make libaapt2_jni

Bug: 203475226
Change-Id: I2331fcac1dbd9e72ed4f929d83160e94e3d5167c
2021-10-28 10:56:39 +08:00
Jerome Gaillard
27ec925d47 Do not include layoutlib in the SDK sources
The project inside frameworks/layoutlib is only used by Android Studio
for rendering Android resources. It is not part of the Android OS, and
it doesn't make sense that it is included in the SDK sources.

Bug: N/A
Test: build SDK sources and check no file from frameworks/layoutlib
present
Change-Id: Ie88108776cc73c398e1b4a023d9889f36394b127
2021-10-21 17:20:37 +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