aboutsummaryrefslogtreecommitdiffstats
path: root/java
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'android-10.0.0_r31' into lineage-17.1-android-10.0.0_r31Luca Stefani2020-03-074-16/+29
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android 10.0.0 release 31 * tag 'android-10.0.0_r31': Revert submission 9940985-qpr1-dev merge Revert submission 9919844-manual r1 merge DO NOT MERGE: Add tradefed_java_library_host DO NOT MERGE: Add tradefed_java_library_host DO NOT MERGE: Add tradefed_java_library_host Switch to clang-r353983c1. Switch to clang-r353983d Shard gensrcs modules into multiple commands Move sharding functions for reuse Rewrite depfile from sbox to stay reproducible Support RuleBuilder.Sbox to wrap commands in sbox Update droidstubs build target Change-Id: Iff6698461ec43d1c74e70e3a693ebd028fe7b8b7
| * Revert submission 9940985-qpr1-dev mergeKimberly Kreider2019-12-202-44/+1
| | | | | | | | | | | | | | | | | | | | Reason for revert: broke tests b/146476630 Bug: 146476630 Reverted Changes: Change-Id: I48c73bcb0819f7cb4c41834cdd680e9e6c323be7 Exclude all builds containing Colin's original change Meged-In: f0f2e2cf79558569c227e8d96a784d9c0679814a
| * DO NOT MERGE: Add tradefed_java_library_hostColin Cross2019-12-172-1/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | Add a module type for tradefed libraries that causes an additional copy to be installed at out/host/linux-x86/tradefed. Bug: 143908003 Exclude merging into *-plus-aosp branches, since they already include the change. Merged-In: I670345494abbad80dacab54471e635abfae3b3b3 Merged-In: I1cb25bbd5823a14f1a9428d58827677eff22ec7e Change-Id: I55bca53e02588827374896ef87d58f3f4bdc48c7 (cherry picked from commit f0f2e2cf79558569c227e8d96a784d9c0679814a) (cherry picked from commit cba45b28925b2fb3ebbd9e281a185de0d2b8b0c7)
| * Move sharding functions for reuseColin Cross2019-11-212-14/+2
| | | | | | | | | | | | | | | | | | | | | | Move shardPaths and shardTests to android.ShardPaths and android.ShardStrings for reuse in other packages. Bug: 144948629 Test: m checkbuild Change-Id: I868802872c73616b80f56cbf11f959c01a8b793a Merged-In: I868802872c73616b80f56cbf11f959c01a8b793a (cherry picked from commit 0a2f719bcaad397f27bcf52cd6604df6b5cec03b)
| * Update droidstubs build targetJerome Gaillard2019-11-182-2/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows to use Metalava to generate metadata files useful for Android Studio as part of a droidstubs target. Once those files have been created in a new metadata folder, they are zipped to make it easier to transfer them into the out/target/common/obj/PACKAGING folder where they can then be picked up by the SDK build to be included there. Bug: 142480924 Test: m sdk Change-Id: I4be1c9e78369c65ee9cd94706c6d20ab0df6b797 Merged-In: I4be1c9e78369c65ee9cd94706c6d20ab0df6b797
* | Uncompress dex in unbundled privileged appsColin Cross2020-02-011-5/+6
| | | | | | | | | | | | | | | | | | | | Mainline builds privileged apps unbundled and then uses them as prebuilts, so they need to respect the privileged flag when deciding whether or not to uncompress the dex. Bug: 135772877 Test: TestUncompressDex Change-Id: I91da7116b779ae35c0617ef77dbcb9788902370c
* | soong: Give priority to modules in exported namespaces for bootjarsSam Mortimer2019-12-113-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Looking for modules that provide a boot jar is currently done by module name match only. This breaks when you have multiple copies of the same module in your build tree (eg in another device). * Add a new mutator that marks the modules that should be used for bootjar content. * The logic is simple: give priority to modules that are in exported soong namespace. Change-Id: I2476174b892475c14a9f10b5e66b8496186f81c0
* | Comment out broken android_app_imports testsRashed Abdel-Tawab2019-12-111-0/+10
| | | | | | | | Change-Id: Ia7404539bf155819e15495c96238c6359b9a065c
* | Fix split apk paths.Jaewoong Jung2019-12-112-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | Soong has been outputting incorrect Android.mk entries for split apks. soong_app_prebuilt.mk expects LOCAL_SOONG_BUILT_INSTALLED to contain a list of <split apk path>:<on device install path> pairs whereas Soong outputs <split apk path>:$(LOCAL_MODULE_PATH)/<split apk filename> pairs. This also adds a missing underscore in split apk filenames. Test: m Split Bug: 140795853 Change-Id: I3d6506f5e12106174fbbaef34749a272b5e1b90c
* | Fix android_test install path.Jaewoong Jung2019-12-111-10/+17
| | | | | | | | | | | | Test: m nothing + diff soong mk and ninja files. Bug: 140795853 Change-Id: I3667eac951dea7e447cf73219ff89199fca9ed63
* | AndroidMkEntries minor refactoring.Jaewoong Jung2019-12-111-12/+14
| | | | | | | | | | | | | | | | | | This includes a few changes that make AndroidMkEntries more resemble AndroidMkData, especially in terms of how extra entries are added. Most importantly it can now have multiple custom functions. Test: Soong tests Change-Id: Ibf9102624d16d0c1c9894a2794fc7c797bb34c9a
* | New AndroidMk authoring system based on entry map.Jaewoong Jung2019-12-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | The new system collects all Android.mk variable assignments using a map and writes them to io.Writer. Compared to the previous system, which directly writes all entries to buffers, this new system is more robust and test-friendly. Test: Built without prebuilt_etc.go change and diffed the mk output. Test: prebuilt_etc_test.go Change-Id: Idd28443d129ff70053295015e69328a8fa3eca47
* | Add default_dev_cert to android_app_importJaewoong Jung2019-12-112-10/+52
| | | | | | | | | | | | | | Test: app_test.go Bug: 122333215 Bug: 128610294 Change-Id: I4be98a57ffec0885258ed7d7bb2badc8b2798750
* | Add arch variant support to android_app_import.Jaewoong Jung2019-12-113-30/+116
| | | | | | | | | | | | | | Bug: 128610294 Fixes: 138792623 Test: app_test.go Change-Id: I47c80ec283ce58a0ce9b7d0af40844bd73e9d3f1
* | Add filename property to android_app_importJaewoong Jung2019-12-113-21/+70
| | | | | | | | | | | | Test: app_test.go Bug: 137218697 Change-Id: If2b20a355bb6e9e8dbcd57347c0e2c6fa041a932
* | Improve android_app_import.dpi_variants handling.Jaewoong Jung2019-12-112-70/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | Instead of circumventing the limitation of Prebuilt implementation by picking a source path itself, it now uses the same mechanism as archMutator and replaces the source path in advance so that Prebuilt always sees the corrent source path. Because this requires the Apk field to be a string pointer, the single source prebuilt implementation is being updated to be reflection-based. Test: Soong unit tests, m soong_docs, TreeHugger Change-Id: I2304f15e32d632f74f95f0d9e9bf1f75ff3e2225
* | Implement DPI variants in android_app_import.Jaewoong Jung2019-12-113-9/+164
| | | | | | | | | | | | Bug: 128610294 Test: app_test.go Change-Id: Ie3e558bfdb40de6b0b9df95d3b373d08a4084d7b
* | Uncompress dex file in imported apk when needed.Jaewoong Jung2019-12-111-0/+18
| | | | | | | | | | | | | | This implements the uncompress-dexs macro's behavior in Soong. Test: Converted TvSampleLeanbackLauncher + zipinfo Change-Id: I9477aa21429d055f3f36ca90c7fd2c345c999029
* | uncompressedDex option for android_app_import.Jaewoong Jung2019-12-111-13/+18
| | | | | | | | | | | | | | | | This also partially consolidates shouldUncompressDex implementations. Bug: 128610294 Test: TreeHugger Change-Id: I7cea5a3890ddd473f63c0738a35af067455b5c4d
* | Add android_app_import.Jaewoong Jung2019-12-116-31/+286
| | | | | | | | | | | | | | | | This is an initial version that handles the most basic cases. Bug: 128610294 Test: app_test.go + prebuilt webview.apk Change-Id: Ic525559aad5612987e50aa75b326b77b23acb716
* | Stop using build/target -> build/make/target symlinkDan Willemsen2019-12-112-6/+6
| | | | | | | | | | | | | | Instead, fully specify build/make/target/... everywhere Test: treehugger Change-Id: I07ba0e9b0604919a271afd5133070616e1f404fc
* | Make additional manifests transitiveLuca Stefani2019-12-111-7/+6
| | | | | | | | | | Test: m, additional_manifests is now transitive Change-Id: I3134c5e942959fe762024602fd833ec4a4312d2c
* | Add 'Additional_manifest' property to merge other manifestschangho.shin2019-12-111-1/+8
| | | | | | | | | | | | | | | | This is equivalent to 'LOCAL_FULL_LIBS_MANIFEST_FILES' in Make. Fixes: 123374442 Test: m -j Change-Id: Ic4b40a08f2454687c74949020598651acea3b2dd
* | Pass --remove-tools-declarations to manifest mergerColin Cross2019-12-112-4/+13
| | | | | | | | | | | | | | | | | | Manifest merger needs --remove-tools-declarations to match Gradle behavior. Bug: 112607039 Test: m checkbuild Change-Id: Id93bcaeaf03770a4acd2e1fdf44e418f55540dd3
* | Don't use merged manifest for android_library modulesColin Cross2019-12-113-47/+65
| | | | | | | | | | | | | | | | | | | | | | | | Don't use the merged manifest for android_library modules. We still have to run manifest merger for android_library modules because Make can't handle transitive dependencies, so it will continue to merge the manifests at each library, and then merge the manifests of direct dependencies into the final application. Bug: 113294940 Test: m checkbuild Change-Id: Ia8f9f910bd0a134730ddf2d542460eeddbc0a075
* | soong: Squash of lineage-sdk bringup commitsRashed Abdel-Tawab2019-12-117-5/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Squash of: Author: Rashed Abdel-Tawab <rashed@linux.com> Date: Thu Aug 9 14:08:53 2018 -0700 soong: Special case Lineage SDK * org.lineageos.platform-res.apk needs to be installed to /system/framework * org.lineageos.platform-res needs to be a dependency for org.lineageos.platform and org.lineageos.platform.internal * Add other special exceptions for org.lineageos.platform-res Change-Id: Ic617c07c086916005ea4b88f26d31c61691a45f8 Author: Sam Mortimer <sam@mortimer.me.uk> Date: Thu Aug 30 15:33:16 2018 -0700 soong: make org.lineage.platform-res depend on framework-res *) Allows us to build org.lineage.platform-res with no_framework_libs true (as is done for framework-res). *) Whilst we're here, undo a dependency loop prevention in aar.go that we added during sdk bringup to allow our platform res to build with no_framework_libs false. Change-Id: Ib452a2e45112baf5d61b70b4be1ce0c01dfd84e5 Author: Luca Stefani <luca.stefani.ge1@gmail.com> Date: Mon Feb 4 18:56:52 2019 +0100 Always link org.lineageos.platform-res for org.lineageos.platform.sdk Test: m clean && m org.lineageos.platform.sdk Change-Id: I58956855bd4d1157e2582103c4861e7b384b4f73 Author: Sam Mortimer <sam@mortimer.me.uk> Date: Fri Aug 31 10:52:29 2018 -0700 soong: Allow framework to access lineage-sdk resources *) Make framework depend on lineage-sdk resource package *) Allows framework module to access lineage-sdk resources via usual org.lineageos.platform.internal.R paths. Change-Id: Ifd19d43d9308ac370ad40a499de16bf8ce204beb Change-Id: Icc18de5dfaa83fc0a1eda6f3704f3a92e1de0764
* | Bring back env flag to skip checkapiLuca Stefani2019-12-111-14/+16
| | | | | | | | | | | | * This was removed while moving to soong Change-Id: Ibb41838b891a8a7ede48e687e8da16f87ad0a57b
* | Tune invocations and print full diagnostics on crash for d8 and r8.Sasha Smundak2019-12-111-1/+1
|/ | | | | | Bug: 132766811 Test: treehugger Change-Id: Id6943008e65b9dc3479e8758445e8d679529a8cb
* Merge "API: Add baseline file for API check" into qt-devTreeHugger Robot2019-08-151-9/+33
|\
| * API: Add baseline file for API checkAdrian Roos2019-08-131-9/+33
| | | | | | | | | | | | | | Bug: 139128921 Test: m apicheck Change-Id: Ia10c51fdca10e2a3d1cc3a7bc6d798d447c7b729 Merged-In: Ia10c51fdca10e2a3d1cc3a7bc6d798d447c7b729
* | Fix the unbundled mainline module buildJiyong Park2019-07-152-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change fixes two problems: 1) the prebuilt apexes are force disabled for the unbundled builds because we need to build the modules from the source then 2) the dependencies from an sdk_library module to *.stubs.{public|system|tests} are not added for the unbundled build because the stubs modules are disabled. Bug: 137282010 Test: unbundled mainline builds are successful Test: build com.android.media and inspect the jar file to see if hiddenapi flags are there $ cd out/dist/mainline_modules_arm $ unzip com.android.media.apex apex_payload.img $ mkdir -p mnt $ sudo mount -o ro,loop apex_payload.img mnt $ dexdump2 mnt/javalib/updatable-media.jar | grep hiddenapi shows results Merged-In: I2c00af07aac4a15770d3acab011a36e2e4803bfc Change-Id: I2c00af07aac4a15770d3acab011a36e2e4803bfc
* | Revert "Don't build hiddenapi flags or encode dex for unbundled builds"Jiyong Park2019-07-152-6/+4
|/ | | | | | | | | | | This reverts commit 7b8a567f44b3fdb30eac8211e8ed8e27fb162797. Bug: 137282010 Test: With the CL above this one, the unbundled mainline module build does not fail. Merged-In: I2f49fa7dbe1da92cb282a9bc14acd5830888ed17 Change-Id: I2f49fa7dbe1da92cb282a9bc14acd5830888ed17
* Uncompress dex in unbundled privileged appsColin Cross2019-06-252-5/+91
| | | | | | | | | | | | Mainline builds privileged apps unbundled and then uses them as prebuilts, so they need to respect the privileged flag when deciding whether or not to uncompress the dex. Bug: 135772877 Test: TestUncompressDex Change-Id: I91da7116b779ae35c0617ef77dbcb9788902370c Merged-In: I91da7116b779ae35c0617ef77dbcb9788902370c (cherry picked from commit 53a87f523b75f86008c3e0971489a06a6450a670)
* Optionally embed NOTICE files in apks.Jaewoong Jung2019-06-254-11/+177
| | | | | | | | | | | | | If embed_notices or ALWAYS_EMBED_NOTICES is set, collect NOTICE files from all dependencies of the android_app, merge them with the app's own one (if exists), transform it to HTML, gzip it, and put it as an asset in the final APK output. Bug: 135460391 Test: app_test.go + Built Mainline modules Change-Id: I52d92e2fd19b3f5f396100424665c5cc344190d8 Merged-In: I52d92e2fd19b3f5f396100424665c5cc344190d8 (cherry picked from commit 5b425e2e20c55216c1ed13fcf047b0df33886736)
* Don't build hiddenapi flags or encode dex for unbundled buildsColin Cross2019-05-292-4/+6
| | | | | | | | | | | Builds with TARGET_BUILD_APPS shouldn't build the hiddenapi flags or encode dex files even if frameworks/base exists. Bug: 133343287 Test: mainline modules build Change-Id: I0647451420fd09bb680808b35e1ad3b8f514ba46 Merged-In: I0647451420fd09bb680808b35e1ad3b8f514ba46 (cherry picked from commit 9c74a1ee855b1dcf4871a4cc40f317bd765ab7fd)
* Add No_dist propertySundong Ahn2019-05-161-45/+54
| | | | | | | | | | | For the sysprop apis, we don't need dist. So the No_dist property is added for it. Bug: 132448761 Test: m -j dist Merged-In: I51c6a6b87ab9dc90b6825c0d4d414e958dd7b265 Change-Id: I51c6a6b87ab9dc90b6825c0d4d414e958dd7b265 (cherry picked from commit 80a87b3309192d0f0caa2097a097ed4ed20c6fff)
* Pass other boot classpath locations to the apex image.Nicolas Geoffray2019-05-131-8/+16
| | | | | | | | | | | | | | In order to evaluate the impact of framework classes being in an image. Test: m Bug: 119800099 Exempt-From-Owner-Approval: this is only for an experimental config, which we would like to see the performance before build snap. (cherry picked from commit feef2ef4d7cc146885c482899f9a967554dc083d) Change-Id: I44ea9d99985c3e9d21602f2c612364d0cef0d1ea Merged-In: Ib0d3acf8d2718ee443b3bffe8122a54f92257691
* Support target.hostdex.requiredColin Cross2019-04-262-0/+10
| | | | | | | | | | | Hostdex modules sometimes need extra required modules, add target.hostdex.required. Bug: 131167818 Test: manual Change-Id: I599f3499f0b738556baeb27185371a42b4c2701b Merged-In: I599f3499f0b738556baeb27185371a42b4c2701b (cherry picked from commit 7f87f4fdeb30f612d74001acb26c466cbb452467)
* Merge "Fix handling optimize.enabled from java_defaults" into qt-devColin Cross2019-04-244-5/+43
|\
| * Fix handling optimize.enabled from java_defaultsSasha Smundak2019-04-224-5/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some module types (`android_test`, etc.) set `optimize.enabled` by default. If such module happens to have `defaults` attribute which clears `optimize.enabled`, the latter value is ignored. Fixes: 129858282 Test: unit tests in java_test.go, `atest CtsExtendedMockingTestCases` succeeds with aog/936802 reverted (that is, with cts/test/mocking converted to Android.bp) Change-Id: Ib8e3a0ab0bd489d70ed07f626082aeae31c45e7c Merged-In: Ib8e3a0ab0bd489d70ed07f626082aeae31c45e7c (cherry picked from commit 2057f82161dec05cb23535da713ec0fae44c38d1)
* | Set default target SDK version for APEXJiyong Park2019-04-232-4/+4
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Target SDK version is used for targeting an APEX to a specific set of platform builds. Usually, the targeting is unrestricted (in case the APEX can run on all platforms), or based on platform SDK version (e.g. 28 for P). However, when the platform is under development and SDK is not finalized, the targeting should be much more fine-grained; the APEX should be targeted to a very specific build that supports the same set of APIs that the APEX was built against. To support that, target sdk version is automatically set by the build system. When the platform is released or SDK is finalized, the target sdk version set to the SDK version number. If not, it is set to <version_code>.<fingerprint> (e.g., Q.123456). Note that the target sdk version set by the build system is used only when the target sdk version is not explicitly set in AndroidManifest.xml. Bug: 130541924 Test: UNBUNDLED_BUILD_SDKS_FROM_SOURCE=true \ UNBUNDLED_BUILD_TARGET_SDK_WITH_API_FINGERPRINT=true \ TARGET_BUILD_APPS=com.android.tzdata m build.ninja has --target_sdk_version Q.$$(cat out/soong/api_fingerprint.txt) Test: aapt dump badging out/dist/com.android.tzdata.apex | grep \ targetSdkVersion shows: targetSdkVersion:'Q.6ee443d9ad5f0cca7a43cfa97b7fc62a' Merged-In: I086230d787f01075c28fc3f0163550300fa00212 Change-Id: I086230d787f01075c28fc3f0163550300fa00212 (cherry picked from commit 71b519d6ce98fc0313019d84777bfc04f3799efc)
* Allow codename.fingerprint format for targetSdkVersionColin Cross2019-04-224-14/+84
| | | | | | | | | | | Use codename.fingerprint format for targetSdkVersion if it is unset in the manifest and UNBUNDLED_BUILD_TARGET_SDK_WITH_API_FINGERPRINT=true. Test: manual Bug: 130541924 Change-Id: I4e3b1274cc32038b00b292dc6d67559eb320e9e4 Merged-In: I4e3b1274cc32038b00b292dc6d67559eb320e9e4 (cherry picked from commit 109328714ff626446e16cfdd3103a5b969284841)
* Build framework.aidl in SoongColin Cross2019-04-228-235/+366
| | | | | | | | | | | | | | | Move the rules to build framework.aidl into Soong, and use it when compiling aidl files with sdk_version: "current". Also fixes incorrectly using the aidl includes exported by the "framework" module when the proguardRaiseDep dependency was added. Bug: 130798034 Test: sdk_test.go Change-Id: I126adf1d9e7b6acb528875ff62b974ba7ad9a337 Merged-In: I126adf1d9e7b6acb528875ff62b974ba7ad9a337 (cherry picked from commit 3047fa23da6d9f6e504c81e275ad7f6761fb7c7b)
* Get default sdk_test.go values from configColin Cross2019-04-221-7/+9
| | | | | | | | | | | This will help avoid merge conflicts between branches that have additional default libraries. Bug: 130798034 Test: sdk_test.go Change-Id: I98d5b8b2ea939df7ef57686f3bd913d6a21edc5d Merged-In: I98d5b8b2ea939df7ef57686f3bd913d6a21edc5d (cherry picked from commit 901ea31b7ce8b9c3aac5461cc8a8b3480cffe011)
* Make makevars deterministicColin Cross2019-04-161-0/+7
| | | | | | | | | | Sort map keys before iterating over them to produce makevars. Bug: 130411407 Test: m checkbuild Change-Id: I4153977705da05a5c73e641f93d02f408209c897 Merged-In: I4153977705da05a5c73e641f93d02f408209c897 (cherry picked from commit 91268c668ce952baee0d5ddb922b7b4c8ddd5b1d)
* Merge "Fix package path of android/soong/android pctx" into qt-devTreeHugger Robot2019-04-121-1/+1
|\
| * Fix package path of android/soong/android pctxColin Cross2019-04-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | android/soong/common was renamed to android/soong/android long ago, but the pctx package path was still "android/soong/common". This required all users of rules defined in android/soong/android to import "android/soong/android" and then pctx.Import("android/soong/common"). Bug: 130298888 Test: m checkbuild Change-Id: I20d096522760538f7cfc2bec3d4bfeba99b275d4
* | Include proper deps for signapkDan Willemsen2019-04-101-0/+3
|/ | | | | | | | Bug: 130111713 Test: run signapk remotely, action succeeds after this change Change-Id: I1670a27341591e0762cdfb42bcf424f065837192 Merged-In: I1670a27341591e0762cdfb42bcf424f065837192 (cherry picked from commit c4bd8f82826840e7921bc512b2557e0c39bad068)
* Merge "Check package restrictions for Java libs." into qt-devVladimir Marko2019-04-094-0/+47
|\
| * Check package restrictions for Java libs.Vladimir Marko2019-04-094-0/+47
| | | | | | | | | | | | | | | | | | | | | | Test: m checkbuild; inspect verbose log. Test: Manual - compile with unmet restrictions. Bug: 122937705 (cherry picked from commit 0975ee0de3d2befefa613754b4dd684a1a9b8c0e) Change-Id: Ibecfb53072f060e046d3c8fdca0911d66cc6922d Merged-In: I9360ae8b6d9ce016b7827be5e8ffc6eb521809b7
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-16 11:04:15 +0000