Commit Graph

27 Commits

Author SHA1 Message Date
Santiago Aboy Solanes
dc33a269c7 Remove dmtracedump from development/build
Bug: 287576918
Fixes: 287576918
Change-Id: I7c9c407bbff1b94e6b09898fe10734597fce4d9d
2023-06-27 16:07:45 +01: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
Thiébaud Weksteen
0c211bf161 Merge "Remove e2fsdroid and sload_f2fs from platform sdk" 2022-09-12 23:51:31 +00: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
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
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
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
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
Jiyong Park
d3edb1b2a1 Move android_*_stubs_current modules to frameworks/base
frameworks/base/StubLibraries.bp is the place where the droidstubs and
java_library modules for the API stub libraries are defined.

Bug: N/A
Test: m

Exempt-From-Owner-Approval: cherry-pick from internal

Merged-In: I407d0d939582841ffa651488bf76667ab7ce9c64
(cherry picked from commit f371ec46ec)
Change-Id: I407d0d939582841ffa651488bf76667ab7ce9c64
2019-12-22 17:21:55 +09:00
Paul Duffin
df0d7dfff1 Switch from no_standard_libs:true to sdk_version:"none"
The no_standard_libs property is deprecated in favor of
sdk_version:"none" as the latter is simpler and less error prone.

Bug: 134566750
Test: m droid
Change-Id: I410e4b98481cec1a5512cd138f735038a725287b
2019-06-13 10:22:17 +01:00
Nan Zhang
18babf6827 Remove Metalava related targets in development.
Since api-stubs-docs have been deleted and replaced by Metalava.

Test: m -j checkbuild
Bug: b/70351683 b/78245848
Change-Id: I6dc8b8f903f77699b90cd5e28c55f74c14a20b54
Merged-In: I6dc8b8f903f77699b90cd5e28c55f74c14a20b54
2018-08-07 16:07:33 -07:00
Nan Zhang
b78c3a22f7 Wrap private-stub-annotations in android.jar
Test: javap -classpath classes.jar androidx.annotation.RecentlyNullable
Compiled from "RecentlyNullable.java"
interface androidx.annotation.RecentlyNullable extends java.lang.annotation.Annotation {
}
Bug: b/78245848

Change-Id: Ie28dea72e8795277e78a8fb0ff2173ab60c31078
2018-07-13 16:39:19 -07:00
David Brazdil
51c1288030 Compile API stubs to dex
Add 'compile_dex' flag to API stub rules. Soong will generate build
targets which compile the JARs into dex files. Those will be compared
against the boot class path dex files to determine the public API surface.

Bug: 79409988
Test: m android_stubs_current, check javalib.jar contains classes.dex
Change-Id: Ie7238572ece0678133ba08203108a923ea2f56ba
2018-07-10 10:31:11 +00:00
Nan Zhang
b28bc7e67c Add Metalava based android.jar targets in Androi.bp
Test: m -j metalava_android_stubs_current
Bug: b/78245848
Change-Id: I5720659a72a91a08aebc4631e23001384fdf8264
2018-06-13 17:47:05 -07:00
Colin Cross
9b0d510e08 Add java_system_modules for current sdk stubs
Building with -target 1.9 requires system modules to use in place
of the bootclasspath, add java_system_modules to generate them.

Test: m EXPERIMENTAL_USE_OPENJDK9=true
Change-Id: I3f54b987efa528078b1e34b743137540c69edf74
2018-04-13 17:38:47 -07:00
Nan Zhang
7bec487c2a Set java_version:1.8 for Android stubs jar generation
Currently Soong based Android stubs jar generation is broken
when EXPERIMENTAL_USE_OPENJDK9=true with following errors:
"Unable to find package java.lang in classpath or bootclasspath"

In old development/build/build_android_stubs.mk
all these jar targets were forced to be built with -source 1.8 -target
1.8
https://android-review.googlesource.com/c/platform/development/+/630280

Test: m android_stubs_current EXPERIMENTAL_USE_OPENJDK9=true
Bug: b/70351683

Change-Id: Ice0224a97e458f92e5b4c5994fa67079d2788d57
2018-03-21 17:47:06 -07:00
Nan Zhang
394d86b3cd Generate Soong based (system/test_)stubs_current jar
And remove build_android_stubs.mk
Bug: b/70351683

Test: m soong_android_stubs_current
cp out/soong/.intermediates/development/build/soong_android_stubs_current/android_common/combined/soong_android_stubs_current.jar new/ &&
cp out/target/common/obj/JAVA_LIBRARIES/android_stubs_current_intermediates/classes.jar old/ &&
cd new/; find . -type f -name "*.class" -exec md5sum {} \+ | ( cd old; md5sum -c --quiet )

zipinfo > entries.toc, results are identical.

Change-Id: I24013e20481392e15ef6362c5cc239740531625f
Merged-In: I24013e20481392e15ef6362c5cc239740531625f
2018-03-20 11:29:54 -07:00