diff options
| author | Colin Cross <ccross@android.com> | 2014-01-24 23:17:21 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2014-01-27 14:45:44 -0800 |
| commit | d826264621a2c3d27228b395bc36edf5510bcc49 (patch) | |
| tree | 2a34d5b309dc375e831c5ddceb9e557ed93ac192 /core/envsetup.mk | |
| parent | d0378b3f2dbb5a5ff0cf0517354606f3f808d790 (diff) | |
| download | build-d826264621a2c3d27228b395bc36edf5510bcc49.zip build-d826264621a2c3d27228b395bc36edf5510bcc49.tar.gz build-d826264621a2c3d27228b395bc36edf5510bcc49.tar.bz2 | |
add new gen/ directory for generated sources
Allow modules to generate source into $OUT/gen, which will then
be copied into $OUT/obj and $OUT/obj_$(TARGET_2ND_ARCH) as
necessary. This allows a single build rule invocation that includes
generated source to build for the first and second architectures.
Modules will need to change calls to local-intermediates-dir into
local-generated-sources-dir.
Change-Id: I62504bad9454b3d9fde7b84ab9f0a487a2ecf0bf
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 a348eb7..4cb389b 100644 --- a/core/envsetup.mk +++ b/core/envsetup.mk @@ -208,11 +208,17 @@ HOST_OUT_INTERMEDIATE_LIBRARIES := $(HOST_OUT_INTERMEDIATES)/lib HOST_OUT_NOTICE_FILES := $(HOST_OUT_INTERMEDIATES)/NOTICE_FILES HOST_OUT_COMMON_INTERMEDIATES := $(HOST_COMMON_OUT_ROOT)/obj +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 |