aboutsummaryrefslogtreecommitdiffstats
path: root/java
Commit message (Collapse)AuthorAgeFilesLines
...
* | Use the full dexpreopt boot classpath when preopting with other images.Nicolas Geoffray2019-04-081-2/+6
|/ | | | | | | | | | Bug: 119800099 Test: m (cherry picked from commit 06758a7e13d2fe26bc8e2798bba21dd85e4cd2de) Change-Id: I60c154c3b3e2ab9b80ea9df0efa168ccd9efcc60 Merged-In: Ia9b34aa92ebb1b4de96ea0f8f290d798be19b2cf
* Use the apex image when the device config asks for it.Nicolas Geoffray2019-04-051-0/+3
| | | | | | | | | | Test: lunch walleye_jitzygote-userdebug m && all odex file use the apex image Bug: 119800099 (cherry picked from commit 25c0e03520f40a5aa0b0525715297fa1f09f8f03) Change-Id: I901ed57136885f87470d1ee398b92972151547f2 Merged-In: Id2fff6a4569d48b8e6a886cb82bdba205b0dd56a
* Merge "Fix sdk_version: "system_current" when Platform_sdk_final=true" am: ↵Colin Cross2019-04-034-19/+58
|\ | | | | | | | | | | | | | | b007b2bde5 am: 8c3f398c6c am: 209edee425 Change-Id: I54ea846c9ac2b29354109755225db71dcdaa1527
| * Merge "Fix sdk_version: "system_current" when Platform_sdk_final=true"Colin Cross2019-04-034-19/+58
| |\
| | * Fix sdk_version: "system_current" when Platform_sdk_final=trueColin Cross2019-04-024-19/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When PLATFORM_VERSION_CODENAME is set to REL Platform_sdk_final becomes true, which causes the return value of sdkVersionToNumber for "system_current" to a real version number instead of FutureApiLevel. This enables the check against PlatformSystemSdkVersions, which doesn't contain "current". Use the numeric value instead. Fixes: 129786845 Test: sdk_test.go Change-Id: If7cf211cc01c5fbf3e3ece3c3f604718a13d5a9b
* | | Merge "Fix panic when missing hiddenapi jar" am: f5df780fc2 am: f5a8e0e88dColin Cross2019-04-031-1/+1
|\| | | | | | | | | | | | | | | | | am: c2c2824ff9 Change-Id: I358685842ca77c435a02b52bf2b278a841a51808
| * | Fix panic when missing hiddenapi jarColin Cross2019-04-021-1/+1
| |/ | | | | | | | | | | | | | | | | Fix a panic after reporting an error when a module is listed in ProductHiddenAPIStubs but doesn't exist or doesn't produce a dex jar. Test: manual Change-Id: I43643cbc5303536bfe0b02feedb03563ea0b540a
* | Add support for protoc plugins am: fe17f6f0e8 am: 91c063cfdcColin Cross2019-04-023-37/+36
|\| | | | | | | | | | | am: 7299e418df Change-Id: I30e57f6678343f57233831775b62afa1f043a450
| * Add support for protoc pluginsColin Cross2019-04-023-37/+36
| | | | | | | | | | | | | | | | | | Add a proto.plugin property to allow specifying a custom protoc plugin to generate the code. Fixes: 70706119 Test: m am StreamingProtoTest Change-Id: I1ecdd346284b42bbcc8297019d98d2cd564eb94c
* | Move proto compilation to RuleBuilder am: 19878da6a0 am: 61918685aaColin Cross2019-04-022-62/+30
|\| | | | | | | | | | | am: c8a3eb9110 Change-Id: If3922ee1900d6f3888c7291997ac49d4a939c065
| * Move proto compilation to RuleBuilderColin Cross2019-04-022-62/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Using blueprint.Rule for protoc commands was causing code duplication because there was no good way to run the same protoc for cc, java and python but then run custom source packaging steps for java and python. Move most of the code into a common function that returns a RuleBuilder, and then let java and python add their own commands at the end of the rule. Bug: 70706119 Test: All Soong tests Test: m checkbuild Change-Id: Ic692136775d273bcc4f4de99620ab4878667c83a
* | Merge changes I7dd4ba7f,I7887a67a am: 92cc71606c am: 900574f0cdColin Cross2019-04-021-1/+1
|\| | | | | | | | | | | am: 6c99a30bb7 Change-Id: If557897ed64ecdf8967299b5512392e5485767ae
| * Merge changes I7dd4ba7f,I7887a67aColin Cross2019-04-021-1/+1
| |\ | | | | | | | | | | | | | | | * changes: Add depfile support to RuleBuilder Add RuleBuilderCommand.Flags
| | * Add depfile support to RuleBuilderColin Cross2019-03-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow rules built with RuleBuilder to use depfiles. Ninja only supports a single depfile with single output. If there are multiple outputs in a rule, move all but the first to implicit outputs. If multiple depfiles are specified, use new support in dep_fixer to combine additional depfiles into the first depfile. Test: rule_builder_test.go Change-Id: I7dd4ba7fdf9feaf89b3dd2b7abb0e79006e06018
* | | Merge "Automatically greylist code in 3P packages" am: dca6ac3e35 am: 595282ced1Andrei-Valentin Onea2019-04-021-0/+2
|\| | | | | | | | | | | | | | | | | am: 364388b3a5 Change-Id: I90eb022de6f2d718e8b2637a4c05dd2859045c67
| * | Merge "Automatically greylist code in 3P packages"Andrei-Valentin Onea2019-04-021-0/+2
| |\ \ | | |/ | |/|
| | * Automatically greylist code in 3P packagesAndrei Onea2019-03-291-0/+2
| | | | | | | | | | | | | | | | | | | | | Bug: 129387816 Test: m appcompat Test: frameworks/base/tools/hiddenapi/generate_hiddenapi_lists_test.py Change-Id: Id55abed766a6de6a2c032ee12d5153ab73a8d65c
* | | Merge "Fix an override_module bug." am: 044ead6b1a am: 5ce95f2eafJaewoong Jung2019-03-271-2/+3
|\| | | | | | | | | | | | | | | | | am: ac24969630 Change-Id: I352a380486600c0b48a61daa0457eff09ceb8f66
| * | Fix an override_module bug.Jaewoong Jung2019-03-271-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | proptools.PrependProperties doesn't replace a pointer when both the src and the dst have one. This prevented override_module from overriding simple value pointer properties when the base module has existing values. It turns out this was why the name property needed to be overwritten manually. Bug: 122957760 Test: app_test.go Change-Id: I3302287c31a560422548c22fade95261ddbe606a
* | | Merge "Always package JNI libs into android_test modules" am: eae12cf400 am: ↵Colin Cross2019-03-273-45/+98
|\| | | | | | | | | | | | | | | | | | | | | | | f394fb0a27 am: b1af785608 Change-Id: I73d8243ae1bd428098f4f60b4a22c9b50785c481
| * | Always package JNI libs into android_test modulesColin Cross2019-03-273-45/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | android_test modules should always have native libraries packaged into the APK even when use_embedded_native_libs: false is set. Fixes: 129298278 Test: TestJNIPackaging Change-Id: Idfcc630f7c6579c1280a920b5d71808b0a502e06
* | | Merge "Add package_name property to android_app." am: c7dd408f89 am: 2afb72b7a0Jaewoong Jung2019-03-272-4/+32
|\| | | | | | | | | | | | | | | | | am: fa1f34f99f Change-Id: I59d3f61a8624a2ad4f356d95c67c4d97cbd4c0a4
| * | Merge "Add package_name property to android_app."Jaewoong Jung2019-03-272-4/+32
| |\ \ | | |/ | |/|
| | * Add package_name property to android_app.Jaewoong Jung2019-03-262-4/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | This enables users to override the package name of their apps either directly in android_app or through override_android_app. Bug: 122957760 Test: app_test.go Change-Id: I98080a4076ce970fc85e58fc33495ba9b363eec9
* | | Merge "Add java_test_helper_library" am: d637872f44 am: e988582019Paul Duffin2019-03-262-21/+55
|\| | | | | | | | | | | | | | | | | am: 036526adad Change-Id: Ie734f0aec3b503d0cc767772bc7422c435f9fbe6
| * | Add java_test_helper_libraryPaul Duffin2019-03-252-21/+55
| |/ | | | | | | | | | | | | | | Extracts testSuiteComponent() function to reduce duplication. Bug: 128969758 Test: atest CtsJdwpTestCases Change-Id: I23746b18112d22f8670666f429a665b34b1955fd
* | Merge "Don't visit disabled modules with SOONG_COLLECT_JAVA_DEPS=true" am: ↵Colin Cross2019-03-231-0/+4
|\| | | | | | | | | | | | | | | 6d75c9d18e am: 4e976b56be am: d139b8037c Change-Id: I2007374b40673f07085a94d110cf65cfeda9570e
| * Merge "Don't visit disabled modules with SOONG_COLLECT_JAVA_DEPS=true"Treehugger Robot2019-03-231-0/+4
| |\
| | * Don't visit disabled modules with SOONG_COLLECT_JAVA_DEPS=trueColin Cross2019-03-231-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calling AndroidMk() on a disabled module may not be safe because the module will not have had GenerateAndroidBuildActions() called on it to initialize the data structures that AndroidMk() expects to exist. Check module.Enabled() before generating IDE info. Fixes: 129089976 Test: SOONG_COLLECT_JAVA_DEPS=true m nothing Change-Id: Icd79088c532c1842801f2bf89d92bc1a67109936
* | | Merge "Rename jetifier property and add it to androidmk" am: 4ada982da9 am: ↵Colin Cross2019-03-222-4/+4
|\| | | | | | | | | | | | | | | | | | | | | | | 33938d3188 am: eb1cebad0d Change-Id: I6ae03146be0e84ac0391c5db2a944eb054b8a9e9
| * | Merge "Rename jetifier property and add it to androidmk"Treehugger Robot2019-03-232-4/+4
| |\ \ | | |/ | |/|
| | * Rename jetifier property and add it to androidmkColin Cross2019-03-222-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename jetifier_enabled to jetifier since there are no users yet and it is more consistent with the rest of the Soong properties. Also add it to androidmk translation. Fixes: 123524520 Test: androidmk_test.go Change-Id: Ib4c688cf3cb171a822ddf7dd49467522c4c1276c
* | | Merge "Add synopsis for prebuilt_apis." am: 66f2e8701e am: a04359740dJaewoong Jung2019-03-221-7/+6
|\| | | | | | | | | | | | | | | | | am: 8dce4b328d Change-Id: Ic4a3491e288d9d2316d49cbb1bf6c88ee4934988
| * | Merge "Add synopsis for prebuilt_apis."Jaewoong Jung2019-03-221-7/+6
| |\ \ | | |/ | |/|
| | * Add synopsis for prebuilt_apis.Jaewoong Jung2019-03-211-7/+6
| | | | | | | | | | | | | | | Test: m soong_docs Change-Id: I0e2cefd3dd24e5c8483d32cc325a37e96d3d495c
* | | Merge "Add override_android_app module type." am: e9665723da am: 9874d6abe6Jaewoong Jung2019-03-224-8/+116
|\| | | | | | | | | | | | | | | | | am: c3432e294e Change-Id: I28638a23c6140ae1775187a2afc61b15db97f487
| * | Merge "Add override_android_app module type."Jaewoong Jung2019-03-224-8/+116
| |\ \
| | * | Add override_android_app module type.Jaewoong Jung2019-03-214-8/+116
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a new implementation of overriding module types that makes use of local variants. With this, product owners can use PRODUCT_PACKAGES to decide which override module to include in their products. Bug: 122957760 Bug: 123640028 Test: app_test.go Change-Id: Ie65e97f615d006b6e9475193b6017ea9d97e8e97
* | | Merge "Fix checking of empty slice properties" am: 6b200500cc am: 2aad89a882Inseob Kim2019-03-211-2/+2
|\| | | | | | | | | | | | | | | | | am: adabb74d08 Change-Id: I2529e13a5310163b22ce41c12e5ab2242c944b4a
| * | Merge "Fix checking of empty slice properties"Treehugger Robot2019-03-221-2/+2
| |\ \ | | |/ | |/|
| | * Fix checking of empty slice propertiesInseob Kim2019-03-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Properties can be empty (not nil), and in that case some weird error messages will happen to be emitted. Bug: N/A Test: try to build with api_pacakges: [] and srcs: [] Change-Id: I492077616e742072696265796520737465616b21
* | | Separate device and product overlays am: 53c88448fd am: d24adcf68eAnton Hansson2019-03-214-43/+112
|\| | | | | | | | | | | | | | | | | am: 40286c75e4 Change-Id: I1e6ae2fe7f5cc57271edce235b702b83b64a7902
| * | Separate device and product overlaysAnton Hansson2019-03-214-43/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds book-keeping of whether an overlay came from DEVICE_PACKAGE_OVERLAYS or PRODUCT_PACKAGE_OVERLAYS. This is later used when writing the output to soong_app_prebuilt.mk, to use either LOCAL_SOONG_[DEVICE|PRODUCT]_RRO_PACKAGES depending on the original source. This change is intended to be a noop on its own, but allows a follow-up make change to customize the location of the auto-generated RRO packages. Bug: 127758779 Test: verify noop on presubmit targets Change-Id: Ib24fe1d05be132c360dd6966f7c83968c9939f77
* | | Replace ctx.ExpandSources with android.PathsForModuleSrc am: 8a49795df1 am: ↵Colin Cross2019-03-205-20/+20
|\| | | | | | | | | | | | | | | | | | | | | | | 9bcee1f400 am: 3cafca1d18 Change-Id: I8945a8a775d5931489ef3f3614046207dd816f1e
| * | Replace ctx.ExpandSources with android.PathsForModuleSrcColin Cross2019-03-205-20/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the logic from ctx.ExpandSources into android.PathsForModuleSrc and ctx.ExpandSource into android.PathForModuleSrc, and deprecate them. When combined with the pathDepsMutator this will let all properties that take source paths also take filegroups or genrule outputs, as long as they are tagged with `android:"path"`. Test: All soong tests Change-Id: I01625e76b5da19240e9649bf26a014eeeafcab8f
* | | Remove ModuleSrcPath am: 07e51619a2 am: 734ad216feColin Cross2019-03-202-12/+12
|\| | | | | | | | | | | | | | | | | am: 055d480456 Change-Id: I386ab7a179da59477acc38571f63e652ac47d8a2
| * | Remove ModuleSrcPathColin Cross2019-03-202-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ModuleSrcPath was designed as a type that ensured that modules only referenced sources inside the directory that contained the Android.bp file. In practice they don't work very well, because allowing filegroups and genrules as inputs to any module that takes a source path means that the path might end up being to a file in another source directory or to a generated file in the output directory. Remove ModuleSrcPath, replacing it with SourcePath in the places that need to explicitly refer to a path in the source tree, or Path where it may be a source path or a generated path. Make PathForModuleSrc return a Path instead of a SourcePath in preparation for consolidation with ctx.ExpandSources, which will make it possibly return paths to generated files. Test: All soong tests Change-Id: I973a78470ed14307eea5f6d0cc93942775a65715
* | | Add dex_import module type am: 42be761ebd am: 66f3f2a01aColin Cross2019-03-206-5/+163
|\| | | | | | | | | | | | | | | | | am: 5d56651745 Change-Id: I6a96468ef78f5cd0c1fab335e691bcc19a8988dd
| * | Add dex_import module typeColin Cross2019-03-206-5/+163
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a module type for importing a prebuilt jar that contains classes.dex files. Test: m with a prebuilt jar that contains classes.dex files in PRODUCT_BOOT_JARS Test: java_test.go, dexpreopt_test.go, dexpreopt_bootjars_test.go Bug: 124804356 Bug: 125517186 Change-Id: I496848f9dca11f758d49b1cb68168cec7f8e1718
* | | Merge "Support package_splits" am: d62bfe5604 am: c20ea4c09fColin Cross2019-03-207-10/+82
|\| | | | | | | | | | | | | | | | | am: 58350d8d33 Change-Id: I727b1cb34b5a808f48b399d6ad938f7a993f3229