diff options
| author | Jean-Marie Henaff <jmhenaff@google.com> | 2014-04-22 12:02:55 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-04-22 12:02:56 +0000 |
| commit | b91a1d5c0936ee8e5b16530a18702837375c1d3d (patch) | |
| tree | f44157e1f60a73378f8ad99aad48b750ceb1de67 /dx | |
| parent | 55fd01f336d1729bc6e2d598fd9bccd2c1858499 (diff) | |
| parent | 4961706e9ea0bb64059b767e4e1714f7564b90fa (diff) | |
| download | toolchain_jack-b91a1d5c0936ee8e5b16530a18702837375c1d3d.zip toolchain_jack-b91a1d5c0936ee8e5b16530a18702837375c1d3d.tar.gz toolchain_jack-b91a1d5c0936ee8e5b16530a18702837375c1d3d.tar.bz2 | |
Merge "Clean dx module of jack." into jack-wip-dev
Diffstat (limited to 'dx')
| -rw-r--r-- | dx/etc/manifest.txt | 1 | ||||
| -rw-r--r-- | dx/src/Android.mk | 8 |
2 files changed, 0 insertions, 9 deletions
diff --git a/dx/etc/manifest.txt b/dx/etc/manifest.txt deleted file mode 100644 index 46bbe63..0000000 --- a/dx/etc/manifest.txt +++ /dev/null @@ -1 +0,0 @@ -Main-Class: com.android.dx.command.Main diff --git a/dx/src/Android.mk b/dx/src/Android.mk index 61281e8..7862451 100644 --- a/dx/src/Android.mk +++ b/dx/src/Android.mk @@ -2,25 +2,17 @@ # LOCAL_PATH := $(call my-dir) -# This tool is prebuilt if we're doing an app-only build. -ifeq ($(TARGET_BUILD_APPS),) - # dx java library # ============================================================ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-subdir-java-files) -LOCAL_JAR_MANIFEST := ../etc/manifest.txt LOCAL_MODULE_TAGS := optional LOCAL_MODULE:= dx-jack LOCAL_STATIC_JAVA_LIBRARIES := jsr305lib-jack include $(BUILD_HOST_JAVA_LIBRARY) -INTERNAL_DALVIK_MODULES += $(LOCAL_INSTALLED_MODULE) - -endif # TARGET_BUILD_APPS - # the documentation # ============================================================ include $(CLEAR_VARS) |