diff options
| author | Inseob Kim <inseob@google.com> | 2019-02-28 14:24:05 +0900 |
|---|---|---|
| committer | Inseob Kim <inseob@google.com> | 2019-03-04 10:56:53 +0900 |
| commit | 38449af64fec68617762a693ea7d80f126bb4146 (patch) | |
| tree | 49820c68235bc1d239d06d6a9c59beaaa9f33fb7 /java/sdk_library.go | |
| parent | afbddd8ddd1af593fbb4978f89d967d45b1a2c5c (diff) | |
| download | android_build_soong-38449af64fec68617762a693ea7d80f126bb4146.tar.gz android_build_soong-38449af64fec68617762a693ea7d80f126bb4146.tar.bz2 android_build_soong-38449af64fec68617762a693ea7d80f126bb4146.zip | |
Ignore missing prebuilt_apis of java_sdk_library
Building java_sdk_library without defining prebuilt_apis has been
failing with weird error messages. So one have to touch empty txt files
and create prebuilt_apis module, even when the java_sdk_library is
brand-new and has no previous versions. This commit fixes it so that API
check against previous version is skipped, in the case of missing
prebuilt_apis.
Note that Current api txt files (placed under api/ directory) are still
needed (make update-api)
Bug: 126259114
Test: tries to build without touching empty api txt files.
Change-Id: I93630f4139cbf502621693ec315dc06c0d07d1c3
Diffstat (limited to 'java/sdk_library.go')
| -rw-r--r-- | java/sdk_library.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/java/sdk_library.go b/java/sdk_library.go index df4e08b5..6441c633 100644 --- a/java/sdk_library.go +++ b/java/sdk_library.go @@ -454,8 +454,9 @@ func (module *SdkLibrary) createDocs(mctx android.TopDownMutatorContext, apiScop Merge_annotations_dirs []string Merge_inclusion_annotations_dirs []string Check_api struct { - Current ApiToCheck - Last_released ApiToCheck + Current ApiToCheck + Last_released ApiToCheck + Ignore_missing_latest_api *bool } Aidl struct { Include_dirs []string @@ -524,6 +525,7 @@ func (module *SdkLibrary) createDocs(mctx android.TopDownMutatorContext, apiScop module.latestApiFilegroupName(apiScope)) props.Check_api.Last_released.Removed_api_file = proptools.StringPtr( module.latestRemovedApiFilegroupName(apiScope)) + props.Check_api.Ignore_missing_latest_api = proptools.BoolPtr(true) props.Srcs_lib = module.sdkLibraryProperties.Srcs_lib props.Srcs_lib_whitelist_dirs = module.sdkLibraryProperties.Srcs_lib_whitelist_dirs props.Srcs_lib_whitelist_pkgs = module.sdkLibraryProperties.Srcs_lib_whitelist_pkgs |