diff options
| author | Ying Wang <wangying@google.com> | 2013-04-01 19:00:13 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-04-01 19:00:13 +0000 |
| commit | 51f7dcb9adb60c91bf85d3148c841efa2b3a14f2 (patch) | |
| tree | 5d60862f358b93d5338650703377a432c6093e2c /core | |
| parent | 59fa08bd3c624be9ea06789b70c22b483df612c4 (diff) | |
| parent | 0abb0fd40999f789b7de11090f919746d4732fde (diff) | |
| download | build-51f7dcb9adb60c91bf85d3148c841efa2b3a14f2.zip build-51f7dcb9adb60c91bf85d3148c841efa2b3a14f2.tar.gz build-51f7dcb9adb60c91bf85d3148c841efa2b3a14f2.tar.bz2 | |
Merge "Default install path of shared Java library with tag tests" into jb-mr2-dev
Diffstat (limited to 'core')
| -rw-r--r-- | core/envsetup.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/envsetup.mk b/core/envsetup.mk index 7ede47d..f861586 100644 --- a/core/envsetup.mk +++ b/core/envsetup.mk @@ -205,7 +205,7 @@ TARGET_OUT_FAKE := $(PRODUCT_OUT)/fake_packages TARGET_OUT_DATA := $(PRODUCT_OUT)/$(TARGET_COPY_OUT_DATA) TARGET_OUT_DATA_EXECUTABLES:= $(TARGET_OUT_EXECUTABLES) TARGET_OUT_DATA_SHARED_LIBRARIES:= $(TARGET_OUT_SHARED_LIBRARIES) -TARGET_OUT_DATA_JAVA_LIBRARIES:= $(TARGET_OUT_JAVA_LIBRARIES) +TARGET_OUT_DATA_JAVA_LIBRARIES:= $(TARGET_OUT_DATA)/framework TARGET_OUT_DATA_APPS:= $(TARGET_OUT_DATA)/app TARGET_OUT_DATA_KEYLAYOUT := $(TARGET_OUT_KEYLAYOUT) TARGET_OUT_DATA_KEYCHARS := $(TARGET_OUT_KEYCHARS) |