diff options
| author | Colin Cross <ccross@android.com> | 2018-09-11 21:56:56 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2018-09-12 13:35:43 -0700 |
| commit | fdcbfe2d600fa824c19f0273dd53b9b7f13ea90f (patch) | |
| tree | 26e3965814a8fcb3ee845997cdc86f696c47da7f | |
| parent | 9f85eef4a9394b99031dd4c2aaafc4b74f3b303e (diff) | |
| download | appbundle-master-cuttlefish-testing-release.tar.gz | |
Convert tools/appbundle/bundletool to Android.bpmaster-cuttlefish-testing-release
See build/soong/README.md for more information.
Test: m checkbuild
Change-Id: I2e4c806fd47f806ca71e65e53dced43f1d19a252
Merged-In: I05d86c1d7e8613496aa517454461c9439efbe440
| -rw-r--r-- | bundletool/Android.bp | 18 | ||||
| -rw-r--r-- | bundletool/Android.mk | 37 |
2 files changed, 18 insertions, 37 deletions
diff --git a/bundletool/Android.bp b/bundletool/Android.bp new file mode 100644 index 0000000..ab822b8 --- /dev/null +++ b/bundletool/Android.bp @@ -0,0 +1,18 @@ +java_binary_host { + name: "bundletool", + + wrapper: "etc/bundletool", + srcs: ["java/**/*.java"], + + static_libs: [ + "guava", + "jsr305", + "dagger2-auto-value", + "error_prone_annotations-2.0.18", + ], + + annotation_processors: ["dagger2-auto-value"], + annotation_processor_classes: ["com.google.auto.value.processor.AutoValueProcessor"], + + manifest: "manifest.txt", +} diff --git a/bundletool/Android.mk b/bundletool/Android.mk deleted file mode 100644 index b6c20f8..0000000 --- a/bundletool/Android.mk +++ /dev/null @@ -1,37 +0,0 @@ -LOCAL_PATH:= $(call my-dir) - -## bundletool script - -include $(CLEAR_VARS) - -LOCAL_MODULE := bundletool -LOCAL_MODULE_TAG := optional -LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_IS_HOST_MODULE := true - -include $(BUILD_SYSTEM)/base_rules.mk - -$(LOCAL_BUILT_MODULE): $(HOST_OUT_JAVA_LIBRARIES)/bundletool$(COMMON_JAVA_PACKAGE_SUFFIX) -$(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/etc/bundletool | $(ACP) - @echo "Copy: $(PRIVATE_MODULE) ($@)" - $(copy-file-to-new-target) - $(hide) chmod 755 $@ - -## tool jar - -include $(CLEAR_VARS) - -LOCAL_MODULE := bundletool - -LOCAL_SRC_FILES := $(call all-java-files-under, java) -LOCAL_IS_HOST_MODULE := true -LOCAL_MODULE_TAGS := optional - -LOCAL_STATIC_JAVA_LIBRARIES := guavalib jsr305lib dagger2-auto-value-host error_prone_annotations-2.0.18 - -LOCAL_ANNOTATION_PROCESSORS := dagger2-auto-value-host -LOCAL_ANNOTATION_PROCESSOR_CLASSES := com.google.auto.value.processor.AutoValueProcessor - -LOCAL_JAR_MANIFEST := manifest.txt - -include $(BUILD_HOST_JAVA_LIBRARY) |