diff options
| author | Colin Cross <ccross@android.com> | 2014-01-27 23:48:52 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-27 23:48:52 +0000 |
| commit | 40826c170c6d06d8ab65d654473af65c74973b5c (patch) | |
| tree | 5841d665b6451a7b4aa35a84d33aa36ce88346c1 /core/envsetup.mk | |
| parent | 5742ae4cc767c7362504e6557ad37e2e770df4cb (diff) | |
| parent | 8c89a9ff9cd461e4bc077a91a0c7c32b17a92ebd (diff) | |
| download | build-40826c170c6d06d8ab65d654473af65c74973b5c.zip build-40826c170c6d06d8ab65d654473af65c74973b5c.tar.gz build-40826c170c6d06d8ab65d654473af65c74973b5c.tar.bz2 | |
am 8c89a9ff: am 4695598d: am ae49acbd: am 1acb1b64: Merge changes I62504bad,I16208cca,I4e4ceec6
* commit '8c89a9ff9cd461e4bc077a91a0c7c32b17a92ebd':
add new gen/ directory for generated sources
warn on LOCAL_MODULE_PATH in multiarch shared libraries
Support LOCAL_MODULE_RELATIVE_PATH
Diffstat (limited to 'core/envsetup.mk')
| -rw-r--r-- | core/envsetup.mk | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/core/envsetup.mk b/core/envsetup.mk index ed26c43..b2122e9 100644 --- a/core/envsetup.mk +++ b/core/envsetup.mk @@ -209,11 +209,17 @@ HOST_OUT_NOTICE_FILES := $(HOST_OUT_INTERMEDIATES)/NOTICE_FILES HOST_OUT_COMMON_INTERMEDIATES := $(HOST_COMMON_OUT_ROOT)/obj HOST_OUT_FAKE := $(HOST_OUT)/fake_packages +HOST_OUT_GEN := $(HOST_OUT)/gen +HOST_OUT_COMMON_GEN := $(HOST_COMMON_OUT_ROOT)/gen + TARGET_OUT_INTERMEDIATES := $(PRODUCT_OUT)/obj TARGET_OUT_HEADERS := $(TARGET_OUT_INTERMEDIATES)/include TARGET_OUT_INTERMEDIATE_LIBRARIES := $(TARGET_OUT_INTERMEDIATES)/lib TARGET_OUT_COMMON_INTERMEDIATES := $(TARGET_COMMON_OUT_ROOT)/obj +TARGET_OUT_GEN := $(PRODUCT_OUT)/gen +TARGET_OUT_COMMON_GEN := $(TARGET_COMMON_OUT_ROOT)/gen + TARGET_OUT := $(PRODUCT_OUT)/$(TARGET_COPY_OUT_SYSTEM) TARGET_OUT_EXECUTABLES := $(TARGET_OUT)/bin TARGET_OUT_OPTIONAL_EXECUTABLES := $(TARGET_OUT)/xbin |