diff options
| author | Colin Cross <ccross@android.com> | 2019-01-23 15:49:00 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2019-01-24 23:47:56 +0000 |
| commit | 11ecdd69798c12ab0657aa6fdd03b44ddadda6ad (patch) | |
| tree | 9abe2337d310d2aa1654ff505a7c60b39249f5ef /androidmk | |
| parent | c32c6b0d79b0f907328cce9077d6d5a3864ca269 (diff) | |
| download | build_soong-11ecdd69798c12ab0657aa6fdd03b44ddadda6ad.tar.gz build_soong-11ecdd69798c12ab0657aa6fdd03b44ddadda6ad.tar.bz2 build_soong-11ecdd69798c12ab0657aa6fdd03b44ddadda6ad.zip | |
Translate LOCAL_ANNOTATION_PROCESSORS to java_plugin
The annotation_processors property is deprected, translate
LOCAL_ANNOTATION_PROCESSORS to plugins instead. Also remove
LOCAL_ANNOTATION_PROCESSOR_CLASSES properties, they are
retrieved from java_plugin dependencies instead.
Bug: 77284273
Test: androidmk_test.go
Change-Id: If6f6177262d5579e03bae58d9eb54a599e3da786
Diffstat (limited to 'androidmk')
| -rw-r--r-- | androidmk/cmd/androidmk/android.go | 5 | ||||
| -rw-r--r-- | androidmk/cmd/androidmk/androidmk_test.go | 17 |
2 files changed, 20 insertions, 2 deletions
diff --git a/androidmk/cmd/androidmk/android.go b/androidmk/cmd/androidmk/android.go index 71eb19b6..e7f2531d 100644 --- a/androidmk/cmd/androidmk/android.go +++ b/androidmk/cmd/androidmk/android.go @@ -69,6 +69,8 @@ var rewriteProperties = map[string](func(variableAssignmentContext) error){ "LOCAL_BUILT_MODULE_STEM": skip, "LOCAL_USE_AAPT2": skip, // Always enabled in Soong "LOCAL_JAR_EXCLUDE_FILES": skip, // Soong never excludes files from jars + + "LOCAL_ANNOTATION_PROCESSOR_CLASSES": skip, // Soong gets the processor classes from the plugin } // adds a group of properties all having the same type @@ -147,8 +149,7 @@ func init() { "LOCAL_COMPATIBILITY_SUITE": "test_suites", "LOCAL_OVERRIDES_PACKAGES": "overrides", - "LOCAL_ANNOTATION_PROCESSORS": "annotation_processors", - "LOCAL_ANNOTATION_PROCESSOR_CLASSES": "annotation_processor_classes", + "LOCAL_ANNOTATION_PROCESSORS": "plugins", "LOCAL_PROGUARD_FLAGS": "optimize.proguard_flags", "LOCAL_PROGUARD_FLAG_FILES": "optimize.proguard_flags_files", diff --git a/androidmk/cmd/androidmk/androidmk_test.go b/androidmk/cmd/androidmk/androidmk_test.go index 9874cb2c..5fbe62a0 100644 --- a/androidmk/cmd/androidmk/androidmk_test.go +++ b/androidmk/cmd/androidmk/androidmk_test.go @@ -807,6 +807,23 @@ java_library_host { } `, }, + { + desc: "LOCAL_ANNOTATION_PROCESSORS", + in: ` +include $(CLEAR_VARS) +LOCAL_MODULE := foolib +LOCAL_ANNOTATION_PROCESSORS := bar +LOCAL_ANNOTATION_PROCESSOR_CLASSES := com.bar +include $(BUILD_STATIC_JAVA_LIBRARY) +`, + expected: ` +java_library { + name: "foolib", + plugins: ["bar"], + +} +`, + }, } func TestEndToEnd(t *testing.T) { |