Merge "Convert dx to Android.bp"
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000..ee5fc37
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1 @@
+subdirs = ["dx"]
diff --git a/dx/Android.bp b/dx/Android.bp
new file mode 100644
index 0000000..d641fe6
--- /dev/null
+++ b/dx/Android.bp
@@ -0,0 +1,24 @@
+// Copyright 2006 The Android Open Source Project
+//
+
+// This tool is prebuilt if we're doing an app-only build.
+// ANDROIDMK TRANSLATION ERROR: unsupported conditional
+// ifeq ($(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK)),)
+
+// dx java library
+// ============================================================
+java_binary_host {
+ name: "dx",
+ wrapper: "etc/dx",
+ srcs: ["src/**/*.java"],
+ manifest: "etc/manifest.txt",
+ java_version: "1.7",
+ product_variables: {
+ pdk: {
+ enabled: false,
+ },
+ unbundled_build: {
+ enabled: false,
+ },
+ },
+}
diff --git a/dx/Android.mk b/dx/Android.mk
index 5a12128..d13e291 100644
--- a/dx/Android.mk
+++ b/dx/Android.mk
@@ -9,24 +9,6 @@
# This tool is prebuilt if we're doing an app-only build.
ifeq ($(TARGET_BUILD_APPS)$(filter true,$(TARGET_BUILD_PDK)),)
-# the dx script
-# ============================================================
-include $(CLEAR_VARS)
-LOCAL_IS_HOST_MODULE := true
-LOCAL_MODULE_CLASS := EXECUTABLES
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := dx
-
-include $(BUILD_SYSTEM)/base_rules.mk
-
-$(LOCAL_BUILT_MODULE): $(HOST_OUT_JAVA_LIBRARIES)/dx$(COMMON_JAVA_PACKAGE_SUFFIX)
-$(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/etc/dx | $(ACP)
- @echo "Copy: $(PRIVATE_MODULE) ($@)"
- $(copy-file-to-new-target)
- $(hide) chmod 755 $@
-
-INTERNAL_DALVIK_MODULES += $(LOCAL_INSTALLED_MODULE)
-
# the mainDexClasses rules
# ============================================================
include $(CLEAR_VARS)
diff --git a/dx/src/Android.mk b/dx/src/Android.mk
index 8c9e76b..9bded44 100644
--- a/dx/src/Android.mk
+++ b/dx/src/Android.mk
@@ -7,22 +7,6 @@
dx_src_files := $(call all-subdir-java-files)
-# dx java library
-# ============================================================
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := $(dx_src_files)
-LOCAL_JAR_MANIFEST := ../etc/manifest.txt
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE:= dx
-LOCAL_JAVA_LANGUAGE_VERSION := 1.7
-
-include $(BUILD_HOST_JAVA_LIBRARY)
-
-INTERNAL_DALVIK_MODULES += $(LOCAL_INSTALLED_MODULE)
-
-endif # No TARGET_BUILD_APPS or TARGET_BUILD_PDK
-
# the documentation
# ============================================================
include $(CLEAR_VARS)
@@ -37,3 +21,5 @@
include $(BUILD_DROIDDOC)
dx_src_files :=
+
+endif # No TARGET_BUILD_APPS or TARGET_BUILD_PDK
