diff options
| author | David Srbecky <dsrbecky@google.com> | 2021-08-05 14:34:22 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-08-05 14:34:22 +0000 |
| commit | 62812b58d5bc65a6a19ecd33553142ea53a99827 (patch) | |
| tree | 1c8cf73acfcb3d2c33fd6c109638f27467121f6e | |
| parent | 98f5dc44c96654156fb147b27d1c9362777e07bd (diff) | |
| parent | 077463445692789788ee305c0d26acb5b56d3ce7 (diff) | |
| download | dalvik-62812b58d5bc65a6a19ecd33553142ea53a99827.tar.gz | |
Merge "Move jasmin build rules from make to soong" am: 50eca579ef am: d1f296276d am: 0774634456
Original change: https://android-review.googlesource.com/c/platform/dalvik/+/1784572
Change-Id: Iea2ede190ab814c0be1c2d269d88c8523f041e26
| -rw-r--r-- | dx/Android.bp | 11 | ||||
| -rw-r--r-- | dx/Android.mk | 41 |
2 files changed, 11 insertions, 41 deletions
diff --git a/dx/Android.bp b/dx/Android.bp index bb2a68f43..3783c1f78 100644 --- a/dx/Android.bp +++ b/dx/Android.bp @@ -36,3 +36,14 @@ java_binary_host { }, }, } + +java_binary_host { + name: "jasmin", + wrapper: "etc/jasmin", + static_libs: [ "jasmin-jar" ], +} + +java_import_host { + name: "jasmin-jar", + jars: ["etc/jasmin.jar"], +} diff --git a/dx/Android.mk b/dx/Android.mk index 78d2d40c2..09ccce12a 100644 --- a/dx/Android.mk +++ b/dx/Android.mk @@ -103,44 +103,3 @@ $(LOCAL_INSTALLED_MODULE): | $(installed_shrinkedAndroid) $(installed_mainDexCla INTERNAL_DALVIK_MODULES += $(LOCAL_INSTALLED_MODULE) endif # No TARGET_BUILD_APPS or TARGET_BUILD_PDK - -# the jasmin script -# ============================================================ -include $(CLEAR_VARS) -LOCAL_IS_HOST_MODULE := true -LOCAL_MODULE_CLASS := EXECUTABLES -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE := jasmin -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice -LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE - -include $(BUILD_SYSTEM)/base_rules.mk - -$(LOCAL_BUILT_MODULE): $(HOST_OUT_JAVA_LIBRARIES)/jasmin.jar -$(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/etc/jasmin | $(ACP) - @echo "Copy: $(PRIVATE_MODULE) ($@)" - $(copy-file-to-new-target) - $(hide) chmod 755 $@ - -INTERNAL_DALVIK_MODULES += $(LOCAL_INSTALLED_MODULE) - -# the jasmin lib -# ============================================================ -include $(CLEAR_VARS) -LOCAL_IS_HOST_MODULE := true -LOCAL_MODULE_CLASS := JAVA_LIBRARIES -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE := jasmin.jar -LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0 -LOCAL_LICENSE_CONDITIONS := notice -LOCAL_NOTICE_FILE := $(LOCAL_PATH)/NOTICE - -include $(BUILD_SYSTEM)/base_rules.mk - -$(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/etc/jasmin.jar | $(ACP) - @echo "Copy: $(PRIVATE_MODULE) ($@)" - $(copy-file-to-target) - $(hide) chmod 644 $@ - -INTERNAL_DALVIK_MODULES += $(LOCAL_INSTALLED_MODULE) |