OSDN Git Service
Ying Wang [Mon, 3 Feb 2014 00:45:03 +0000 (00:45 +0000)]
am
a77456b8: Merge "Dedup the targets and dependencies of required modules."
* commit '
a77456b8e8a5e66705e48e1ec4eebc1889553c6a':
Dedup the targets and dependencies of required modules.
Ying Wang [Sat, 1 Feb 2014 03:25:47 +0000 (03:25 +0000)]
Merge "Dedup the targets and dependencies of required modules."
Ying Wang [Sat, 1 Feb 2014 03:22:35 +0000 (19:22 -0800)]
Dedup the targets and dependencies of required modules.
For whatever reason, two modules may have the same file as their
installed module. In that case circular dependency is created if the two
modules have requited-by relation.
Change-Id: I15ed271ca3f3c343e4662182ded5ccc63d6c42cc
Noreen Tolland [Fri, 31 Jan 2014 23:17:33 +0000 (23:17 +0000)]
am
c816e061: Merge "(DO NOT MERGE) Revert "Make libart the default runtime"" into klp-modular-dev
* commit '
c816e061270327d3e2b73ae3c848e1fefc6ec6ef':
(DO NOT MERGE) Revert "Make libart the default runtime"
Noreen Tolland [Fri, 31 Jan 2014 23:13:24 +0000 (23:13 +0000)]
Merge "(DO NOT MERGE) Revert "Make libart the default runtime"" into klp-modular-dev
Ben Cheng [Fri, 31 Jan 2014 12:34:18 +0000 (12:34 +0000)]
am
5608a8c6: Merge "Add 64-bit gdbclients."
* commit '
5608a8c6e86381cdabc46c3a9b90564411771796':
Add 64-bit gdbclients.
Brian Carlstrom [Fri, 31 Jan 2014 12:34:18 +0000 (12:34 +0000)]
am
aae47044: Merge "CleanSpec for
49f1fab8a5b82f6224ff1be601037270ecdb734b: Rename persist.sys.dalvik.vm.lib to allow new default"
* commit '
aae470446504a869db05f9b70b7146ea47d746d5':
CleanSpec for
49f1fab8a5b82f6224ff1be601037270ecdb734b: Rename persist.sys.dalvik.vm.lib to allow new default
Brian Carlstrom [Fri, 31 Jan 2014 12:34:17 +0000 (12:34 +0000)]
am
601d39b6: Merge "build: Rename persist.sys.dalvik.vm.lib to allow new default"
* commit '
601d39b688bcbb1789e145d1b72753206c24d374':
build: Rename persist.sys.dalvik.vm.lib to allow new default
Narayan Kamath [Fri, 31 Jan 2014 12:33:12 +0000 (12:33 +0000)]
Merge "resolved conflicts for merge of
084209e2 to klp-modular-dev-plus-aosp" into klp-modular-dev-plus-aosp
Narayan Kamath [Fri, 31 Jan 2014 12:23:28 +0000 (12:23 +0000)]
resolved conflicts for merge of
084209e2 to klp-modular-dev-plus-aosp
Change-Id: Ibf80470cfcaf553335d07c6fb220f7e9ec81ed87
Ian Rogers [Fri, 31 Jan 2014 12:17:16 +0000 (12:17 +0000)]
am
e854276d: Merge "Disable WITH_HOST_DALVIK on 64bit host builds."
* commit '
e854276dd19ee0ce139cc35f98b49189b7750b2d':
Disable WITH_HOST_DALVIK on 64bit host builds.
Narayan Kamath [Fri, 31 Jan 2014 12:17:03 +0000 (12:17 +0000)]
am
ad9209ad: Merge "Define __STDC_FORMAT_MACROS on Windows host builds."
* commit '
ad9209adff8d2f94c57387ee3d3abcff28049091':
Define __STDC_FORMAT_MACROS on Windows host builds.
Colin Cross [Fri, 31 Jan 2014 10:27:06 +0000 (10:27 +0000)]
am
a8e6166f: Merge "build: rename LOCAL_32BIT_ONLY to LOCAL_32_BIT_ONLY"
* commit '
a8e6166fa482782719dce28a9ae1869f017e7cee':
build: rename LOCAL_32BIT_ONLY to LOCAL_32_BIT_ONLY
Colin Cross [Fri, 31 Jan 2014 10:27:05 +0000 (10:27 +0000)]
am
2dcaf9f4: Merge "build: support LOCAL_*_32 and LOCAL_*_64"
* commit '
2dcaf9f489e5dba385ae4ab75c53d184a6fb780a':
build: support LOCAL_*_32 and LOCAL_*_64
Ian Rogers [Fri, 31 Jan 2014 10:26:52 +0000 (10:26 +0000)]
am
805cb8fa: Merge "Fix the host inttypes.h problem globally."
* commit '
805cb8fa40f71b3e1f6566bf10ca169d4a2ff86f':
Fix the host inttypes.h problem globally.
Brian Carlstrom [Fri, 31 Jan 2014 10:26:48 +0000 (10:26 +0000)]
am
cece05e2: Merge "Bump generic_mips BOARD_SYSTEMIMAGE_PARTITION_SIZE for PRODUCT_RUNTIME := libart_runtime_default"
* commit '
cece05e273dc1c9d4ea140b294df72005ac8ac53':
Bump generic_mips BOARD_SYSTEMIMAGE_PARTITION_SIZE for PRODUCT_RUNTIME := libart_runtime_default
Justin Mattson [Thu, 30 Jan 2014 23:30:08 +0000 (15:30 -0800)]
(DO NOT MERGE) Revert "Make libart the default runtime"
This reverts commit
08d410f53249c18d752f56a881ed2335403080d4.
Ben Cheng [Thu, 30 Jan 2014 22:01:32 +0000 (22:01 +0000)]
Merge "Add 64-bit gdbclients."
Brian Carlstrom [Thu, 30 Jan 2014 22:00:33 +0000 (22:00 +0000)]
Merge "CleanSpec for
49f1fab8a5b82f6224ff1be601037270ecdb734b: Rename persist.sys.dalvik.vm.lib to allow new default"
Brian Carlstrom [Thu, 30 Jan 2014 21:56:51 +0000 (13:56 -0800)]
CleanSpec for
49f1fab8a5b82f6224ff1be601037270ecdb734b: Rename persist.sys.dalvik.vm.lib to allow new default
Change-Id: I3ed55460864c17a199053a058b2482c6c4579622
Serban Constantinescu [Tue, 14 Jan 2014 10:33:53 +0000 (10:33 +0000)]
Add 64-bit gdbclients.
This patch adds gdbclient combo for arm64, mips64, and x86_64.
Change-Id: I659b662276c93e5cce92aadc203a4bc111f5c2af
Signed-off-by: Serban Constantinescu <serban.constantinescu@arm.com>
Brian Carlstrom [Thu, 30 Jan 2014 21:50:48 +0000 (21:50 +0000)]
Merge "build: Rename persist.sys.dalvik.vm.lib to allow new default"
Brian Carlstrom [Thu, 30 Jan 2014 21:14:00 +0000 (13:14 -0800)]
build: Rename persist.sys.dalvik.vm.lib to allow new default
Bug:
12798969
Change-Id: Ie73a3f2b6655d0ae3e3a905a1c64747343c525a0
Brian Carlstrom [Thu, 30 Jan 2014 21:10:25 +0000 (21:10 +0000)]
Merge "CleanSpec for
08d410f53249c18d752f56a881ed2335403080d4: Make libart the default runtime"
Nick Vaccaro [Fri, 24 Jan 2014 18:19:21 +0000 (10:19 -0800)]
Add atrace for supporting systrace tool
Change-Id: I6504a447218a70b0d148c0b5802228fb28934a0a
Signed-off-by: Nick Vaccaro <nvaccaro@google.com>
Ian Rogers [Thu, 30 Jan 2014 19:54:04 +0000 (19:54 +0000)]
Merge "Disable WITH_HOST_DALVIK on 64bit host builds."
Brian Carlstrom [Thu, 30 Jan 2014 19:11:38 +0000 (11:11 -0800)]
CleanSpec for
08d410f53249c18d752f56a881ed2335403080d4: Make libart the default runtime
Change-Id: Id632beeb2f96dd4502ac4a6c03bab5e4252137ff
Ian Rogers [Thu, 30 Jan 2014 16:47:53 +0000 (08:47 -0800)]
Disable WITH_HOST_DALVIK on 64bit host builds.
Change-Id: I8cea32fe5541c3223e7f317245aab3061e8ad444
Narayan Kamath [Thu, 30 Jan 2014 09:39:33 +0000 (09:39 +0000)]
Merge "Define __STDC_FORMAT_MACROS on Windows host builds."
Ian Rogers [Thu, 30 Jan 2014 05:37:37 +0000 (21:37 -0800)]
Define __STDC_FORMAT_MACROS on Windows host builds.
Change-Id: I89b54a63c3f111b8242fe9e813d94a839c484195
Colin Cross [Thu, 30 Jan 2014 04:06:42 +0000 (04:06 +0000)]
Merge "build: rename LOCAL_32BIT_ONLY to LOCAL_32_BIT_ONLY"
Colin Cross [Thu, 30 Jan 2014 04:06:05 +0000 (04:06 +0000)]
Merge "build: support LOCAL_*_32 and LOCAL_*_64"
Colin Cross [Thu, 30 Jan 2014 02:20:01 +0000 (18:20 -0800)]
build: rename LOCAL_32BIT_ONLY to LOCAL_32_BIT_ONLY
Rename for consistency with TARGET_IS_64_BIT.
Change-Id: I824dcaed0c1e88b8246bcffb21ab3f1772175926
Colin Cross [Thu, 30 Jan 2014 01:46:37 +0000 (17:46 -0800)]
build: support LOCAL_*_32 and LOCAL_*_64
Support the following new variables based on whether the current multilib
target is 32 bit or 64 bit:
LOCAL_CFLAGS_32
LOCAL_CFLAGS_64
LOCAL_LDFLAGS_32
LOCAL_LDFLAGS_64
LOCAL_ASFLAGS_32
LOCAL_ASFLAGS_64
LOCAL_C_INCLUDES_32
LOCAL_C_INCLUDES_64
Change-Id: Ia868d56dff114be301bf8297eec768675f186927
Colin Cross [Thu, 30 Jan 2014 00:59:55 +0000 (00:59 +0000)]
am
190ebe94: Merge "pdk: add android_common.jar" into klp-volantis-dev
* commit '
190ebe94e1a3c18183fa1940e7599b4d6f70b470':
pdk: add android_common.jar
Colin Cross [Thu, 30 Jan 2014 00:53:55 +0000 (00:53 +0000)]
Merge "pdk: add android_common.jar" into klp-volantis-dev
Ian Rogers [Thu, 30 Jan 2014 00:33:35 +0000 (00:33 +0000)]
Merge "Fix the host inttypes.h problem globally."
Ian Rogers [Wed, 29 Jan 2014 21:09:30 +0000 (13:09 -0800)]
Fix the host inttypes.h problem globally.
Bug:
12708004
Change-Id: I2c75647bac304b82e150c540b9e6c5568997596d
Brian Carlstrom [Wed, 29 Jan 2014 20:21:27 +0000 (20:21 +0000)]
Merge "Bump generic_mips BOARD_SYSTEMIMAGE_PARTITION_SIZE for PRODUCT_RUNTIME := libart_runtime_default"
Scott Main [Wed, 29 Jan 2014 20:17:05 +0000 (20:17 +0000)]
am
bb783f27: am
a6e8c6c1: am
f72e1846: am
c9e142e6: Merge "add \'get started\' link to the bottom of class home pages" into klp-docs
* commit '
bb783f27bd0de3fc25d47dd7b00df62ca9504f7a':
add 'get started' link to the bottom of class home pages
Scott Main [Wed, 29 Jan 2014 20:15:01 +0000 (20:15 +0000)]
am
a6e8c6c1: am
f72e1846: am
c9e142e6: Merge "add \'get started\' link to the bottom of class home pages" into klp-docs
* commit '
a6e8c6c1e0f659b3532bd86631104360b54016ea':
add 'get started' link to the bottom of class home pages
Scott Main [Wed, 29 Jan 2014 20:11:48 +0000 (20:11 +0000)]
am
f72e1846: am
c9e142e6: Merge "add \'get started\' link to the bottom of class home pages" into klp-docs
* commit '
f72e1846898ec07cedf301ac76875cfa9f1164bc':
add 'get started' link to the bottom of class home pages
Scott Main [Wed, 29 Jan 2014 20:08:49 +0000 (20:08 +0000)]
am
c9e142e6: Merge "add \'get started\' link to the bottom of class home pages" into klp-docs
* commit '
c9e142e62d60b39bb5bd3459358a16c00fc557f3':
add 'get started' link to the bottom of class home pages
Scott Main [Wed, 29 Jan 2014 20:07:13 +0000 (20:07 +0000)]
Merge "add 'get started' link to the bottom of class home pages" into klp-docs
Colin Cross [Wed, 29 Jan 2014 18:01:37 +0000 (10:01 -0800)]
pdk: add android_common.jar
Add android_common.jar to the pdk java libraries to allow partners
to build test apps against it.
Change-Id: I3f3c0f6ef086489aec293e10b0d707845b174655
Brian Carlstrom [Wed, 29 Jan 2014 07:33:52 +0000 (23:33 -0800)]
Bump generic_mips BOARD_SYSTEMIMAGE_PARTITION_SIZE for PRODUCT_RUNTIME := libart_runtime_default
(cherry picked from commit
c8501bffcb6fa3f552ae424a5701091b5faa6270)
Change-Id: I12ce7c4e383e74e54d77b54a0406d2499699edbf
Elliott Hughes [Wed, 29 Jan 2014 01:55:36 +0000 (01:55 +0000)]
am
833188c1: am
e7bd4f5c: am
472a4858: Merge "gtest needs -lpthread."
* commit '
833188c16ea5d2f12aa0108119c327d6cd31d4ea':
gtest needs -lpthread.
Elliott Hughes [Wed, 29 Jan 2014 01:53:14 +0000 (01:53 +0000)]
am
e7bd4f5c: am
472a4858: Merge "gtest needs -lpthread."
* commit '
e7bd4f5cdf5d1ac0c49d42ed41322f10e7f34f9b':
gtest needs -lpthread.
Elliott Hughes [Wed, 29 Jan 2014 01:50:34 +0000 (01:50 +0000)]
am
472a4858: Merge "gtest needs -lpthread."
* commit '
472a48585ec1cfb66c5716f85b0efdf528b29f5d':
gtest needs -lpthread.
Elliott Hughes [Wed, 29 Jan 2014 01:45:17 +0000 (01:45 +0000)]
Merge "gtest needs -lpthread."
Elliott Hughes [Wed, 29 Jan 2014 01:32:30 +0000 (17:32 -0800)]
gtest needs -lpthread.
Host gtests that don't use pthreads themselves need to be linked
against libpthread because gtest itself uses pthreads to ensure
thread-safety. (It can't know in advance whether the code under
test is going to spin up threads, so it has to be pessimistic.)
Change-Id: I14fb1098c163d7fe6ae9a9a0314acead4ec9383d
Brian Carlstrom [Wed, 29 Jan 2014 00:44:02 +0000 (00:44 +0000)]
am
be7575ec: am
cba215dd: am
d21197d5: Merge "Make libart the default runtime"
* commit '
be7575ecb1827784f83582847749aa59c664d29e':
Make libart the default runtime
Brian Carlstrom [Wed, 29 Jan 2014 00:41:31 +0000 (00:41 +0000)]
am
cba215dd: am
d21197d5: Merge "Make libart the default runtime"
* commit '
cba215dd3241ae62416800f8d97d114d8a6e1a9a':
Make libart the default runtime
Brian Carlstrom [Wed, 29 Jan 2014 00:39:45 +0000 (00:39 +0000)]
am
d21197d5: Merge "Make libart the default runtime"
* commit '
d21197d50caaa025bd823a004984a2820bb3c2e2':
Make libart the default runtime
Brian Carlstrom [Wed, 29 Jan 2014 00:32:23 +0000 (00:32 +0000)]
Merge "Make libart the default runtime"
Elliott Hughes [Tue, 28 Jan 2014 21:37:15 +0000 (21:37 +0000)]
am
f7784e46: am
1a0e8501: am
1a731adf: Merge "Fix KERNEL_HEADERS_ARCH for mips and x86."
* commit '
f7784e46170e90cb38ddbab15b7aa3a4a7e2d07d':
Fix KERNEL_HEADERS_ARCH for mips and x86.
Elliott Hughes [Tue, 28 Jan 2014 21:35:25 +0000 (21:35 +0000)]
am
1a0e8501: am
1a731adf: Merge "Fix KERNEL_HEADERS_ARCH for mips and x86."
* commit '
1a0e850141fe19e1f1d503822893b8d66c0bca69':
Fix KERNEL_HEADERS_ARCH for mips and x86.
Elliott Hughes [Tue, 28 Jan 2014 21:29:52 +0000 (21:29 +0000)]
am
1a731adf: Merge "Fix KERNEL_HEADERS_ARCH for mips and x86."
* commit '
1a731adf943bc716cc7b9c95b321db02ad7216db':
Fix KERNEL_HEADERS_ARCH for mips and x86.
Elliott Hughes [Tue, 28 Jan 2014 21:23:07 +0000 (21:23 +0000)]
Merge "Fix KERNEL_HEADERS_ARCH for mips and x86."
Elliott Hughes [Tue, 28 Jan 2014 21:07:55 +0000 (13:07 -0800)]
Fix KERNEL_HEADERS_ARCH for mips and x86.
arm and arm64 have distinct headers, but mips and mip64, and x86 and x86_64
use headers that work for both widths. So where arm/arm64 need to handle the
second architecture case specially, all we need to do for the others is
hard-code the name. (x86_64.mk already hard-codes x86; we need to change
x86.mk for the case where we're building the 32-bit binaries for a mixed
system. mips64.mk doesn't exist yet, but when it does, it'll hard-code
just plain "mips" too.)
Change-Id: Ia6b9f77b4eb2c78729b454045875c409e0ea8197
Brian Carlstrom [Tue, 28 Jan 2014 20:54:10 +0000 (20:54 +0000)]
am
dc5dd9b4: am
d3737d07: am
49eb4409: Merge "build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA"
* commit '
dc5dd9b47fe2a24410b3e70d320655f1b5455966':
build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA
Brian Carlstrom [Tue, 28 Jan 2014 20:52:17 +0000 (20:52 +0000)]
am
d3737d07: am
49eb4409: Merge "build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA"
* commit '
d3737d07c8adb0848dcddb7df03d1e6b4378ab93':
build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA
Brian Carlstrom [Tue, 28 Jan 2014 20:50:19 +0000 (20:50 +0000)]
am
49eb4409: Merge "build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA"
* commit '
49eb440980db6680ec08c48b416e37e937bf9003':
build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA
Brian Carlstrom [Tue, 28 Jan 2014 20:45:32 +0000 (20:45 +0000)]
Merge "build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA"
Brian Carlstrom [Fri, 17 Jan 2014 07:25:27 +0000 (23:25 -0800)]
build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA
(cherry-picked from commit
cd337c71ee65b17529a67af34d4c0b2824a4f175)
Change-Id: I6d8ab3b3cf52f6a6b15f1c8e8d00cdf59042436b
Brian Carlstrom [Fri, 17 Jan 2014 01:55:07 +0000 (17:55 -0800)]
Make libart the default runtime
Change-Id: I4394f2bdef6f1be36f0f17f3b42d3e62bc2245ef
Colin Cross [Tue, 28 Jan 2014 02:37:21 +0000 (02:37 +0000)]
am
cb1ad445: am
0d24616d: am
cdd14758: Merge "Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS"
* commit '
cb1ad445663d190e204330b596b52e4734d9dcf0':
Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS
Colin Cross [Tue, 28 Jan 2014 02:34:05 +0000 (02:34 +0000)]
am
0d24616d: am
cdd14758: Merge "Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS"
* commit '
0d24616dd1b29e016aaae86761574fd88d701b6d':
Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS
Colin Cross [Tue, 28 Jan 2014 02:31:18 +0000 (02:31 +0000)]
am
cdd14758: Merge "Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS"
* commit '
cdd1475834156b2e45b73ae86a949efa6c1215eb':
Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS
Colin Cross [Tue, 28 Jan 2014 02:25:45 +0000 (02:25 +0000)]
Merge "Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS"
Colin Cross [Tue, 28 Jan 2014 01:34:21 +0000 (17:34 -0800)]
Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS
To ease the transition between toolchains, allow a target to specify
a list of cflags that the toolchain does not support. These will be
filtered out of the cflags provided by the module.
Add TARGET_GLOBAL_UNSUPPORTED_CFLAGS := -fstack-protector for the
aarch64 toolchain, it does not yet suport -fstack-protector.
Change-Id: I168d0c6f131326fad305ec86fad46e6a3e03295a
Elliott Hughes [Tue, 28 Jan 2014 00:59:15 +0000 (00:59 +0000)]
am
69c36ee7: am
4fbf23ef: am
0a3cf1a0: Merge "Remove libthread_db from the default include path."
* commit '
69c36ee7a8c1e3d8c7ca04d61f75d95585c58253':
Remove libthread_db from the default include path.
Elliott Hughes [Tue, 28 Jan 2014 00:54:33 +0000 (00:54 +0000)]
am
4fbf23ef: am
0a3cf1a0: Merge "Remove libthread_db from the default include path."
* commit '
4fbf23ef8267849ce88217a256b394de3904a4f6':
Remove libthread_db from the default include path.
Elliott Hughes [Tue, 28 Jan 2014 00:43:29 +0000 (00:43 +0000)]
am
0a3cf1a0: Merge "Remove libthread_db from the default include path."
* commit '
0a3cf1a0e5c6dbe132c1dc5e13293960c5e7b103':
Remove libthread_db from the default include path.
Ying Wang [Tue, 28 Jan 2014 00:08:19 +0000 (00:08 +0000)]
am
a8d15474: am
04cff708: resolved conflicts for merge of
7382ec7d to klp-dev-plus-aosp
* commit '
a8d15474ebb7b595f842ffb23a36cce9bc382f10':
ota_from_target_files: Add an option to not sign OTA packages
Ying Wang [Tue, 28 Jan 2014 00:00:50 +0000 (00:00 +0000)]
am
04cff708: resolved conflicts for merge of
7382ec7d to klp-dev-plus-aosp
* commit '
04cff70804810d27e1fcbef556ebfdc39278d746':
ota_from_target_files: Add an option to not sign OTA packages
Elliott Hughes [Tue, 28 Jan 2014 00:00:19 +0000 (00:00 +0000)]
Merge "Remove libthread_db from the default include path."
Ying Wang [Mon, 27 Jan 2014 23:56:45 +0000 (15:56 -0800)]
resolved conflicts for merge of
7382ec7d to klp-dev-plus-aosp
Change-Id: Ic414d3ec8b52b1045125e1b76deae8a4a59a5e52
Colin Cross [Mon, 27 Jan 2014 23:46:39 +0000 (23:46 +0000)]
am
4695598d: am
ae49acbd: am
1acb1b64: Merge changes I62504bad,I16208cca,I4e4ceec6
* commit '
4695598df1fa11064a54421f60fee66032c673ee':
add new gen/ directory for generated sources
warn on LOCAL_MODULE_PATH in multiarch shared libraries
Support LOCAL_MODULE_RELATIVE_PATH
Elliott Hughes [Mon, 27 Jan 2014 23:43:19 +0000 (15:43 -0800)]
Remove libthread_db from the default include path.
This should never have been on the default include path.
The NDK statically links its own libthread_db, so I'm removing
bionic's unused copy from devices.
Bug:
11882807
Change-Id: I49a67fe0902cc4bc178360f6c993959774d74e3a
Colin Cross [Mon, 27 Jan 2014 23:43:33 +0000 (23:43 +0000)]
am
ae49acbd: am
1acb1b64: Merge changes I62504bad,I16208cca,I4e4ceec6
* commit '
ae49acbde766e2e683d3dd026e69f2416da766b1':
add new gen/ directory for generated sources
warn on LOCAL_MODULE_PATH in multiarch shared libraries
Support LOCAL_MODULE_RELATIVE_PATH
Ying Wang [Mon, 27 Jan 2014 23:42:11 +0000 (23:42 +0000)]
am
ae1c7d96: am
50c548c8: am
25a16fe8: Merge "Don\'t modify LOCAL_MODULE_TAGS."
* commit '
ae1c7d960715ec90afa4accf0754f176d088a30f':
Don't modify LOCAL_MODULE_TAGS.
Colin Cross [Mon, 27 Jan 2014 23:40:22 +0000 (15:40 -0800)]
am
1acb1b64: Merge changes I62504bad,I16208cca,I4e4ceec6
* commit '
1acb1b64b9be43503fa2a9949858b8bb36417e32':
add new gen/ directory for generated sources
warn on LOCAL_MODULE_PATH in multiarch shared libraries
Support LOCAL_MODULE_RELATIVE_PATH
Ying Wang [Mon, 27 Jan 2014 23:37:18 +0000 (23:37 +0000)]
Merge "ota_from_target_files: Add an option to not sign OTA packages"
Colin Cross [Mon, 27 Jan 2014 23:35:00 +0000 (23:35 +0000)]
Merge changes I62504bad,I16208cca,I4e4ceec6
* changes:
add new gen/ directory for generated sources
warn on LOCAL_MODULE_PATH in multiarch shared libraries
Support LOCAL_MODULE_RELATIVE_PATH
Ying Wang [Mon, 27 Jan 2014 23:32:44 +0000 (23:32 +0000)]
am
50c548c8: am
25a16fe8: Merge "Don\'t modify LOCAL_MODULE_TAGS."
* commit '
50c548c8f4e0df0c3a04e2b1cc91d79e067d940e':
Don't modify LOCAL_MODULE_TAGS.
Ying Wang [Mon, 27 Jan 2014 23:25:35 +0000 (15:25 -0800)]
am
25a16fe8: Merge "Don\'t modify LOCAL_MODULE_TAGS."
* commit '
25a16fe80ee7795c4763045061779f3c7068813d':
Don't modify LOCAL_MODULE_TAGS.
Ying Wang [Mon, 27 Jan 2014 23:20:05 +0000 (23:20 +0000)]
Merge "Don't modify LOCAL_MODULE_TAGS."
Ying Wang [Mon, 27 Jan 2014 23:19:09 +0000 (15:19 -0800)]
Don't modify LOCAL_MODULE_TAGS.
Change-Id: Id70d48c1d7abf02139925bcb3208515ea1a082b9
Ying Wang [Mon, 27 Jan 2014 23:05:22 +0000 (23:05 +0000)]
am
a4d70f94: am
0105f1cc: am
07b16c0d: Merge "collect_gpl_sources.mk: Declare rule to assemble GPL sources FORCE"
* commit '
a4d70f9435764339695e9264ac5d815a894e1e9f':
collect_gpl_sources.mk: Declare rule to assemble GPL sources FORCE
Ying Wang [Mon, 27 Jan 2014 23:01:02 +0000 (23:01 +0000)]
am
0105f1cc: am
07b16c0d: Merge "collect_gpl_sources.mk: Declare rule to assemble GPL sources FORCE"
* commit '
0105f1cc9aa2ea3c683c197b18747f5b04310c27':
collect_gpl_sources.mk: Declare rule to assemble GPL sources FORCE
Ying Wang [Mon, 27 Jan 2014 22:57:57 +0000 (14:57 -0800)]
am
07b16c0d: Merge "collect_gpl_sources.mk: Declare rule to assemble GPL sources FORCE"
* commit '
07b16c0d5be77e53325a9f93c2f7f68632417792':
collect_gpl_sources.mk: Declare rule to assemble GPL sources FORCE
Ying Wang [Mon, 27 Jan 2014 22:52:13 +0000 (22:52 +0000)]
Merge "collect_gpl_sources.mk: Declare rule to assemble GPL sources FORCE"
Colin Cross [Sat, 25 Jan 2014 07:17:21 +0000 (23:17 -0800)]
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
Colin Cross [Sat, 25 Jan 2014 03:30:27 +0000 (19:30 -0800)]
warn on LOCAL_MODULE_PATH in multiarch shared libraries
Using LOCAL_MODULE_PATH in a shared library module while building a
multiarch target will cause build rules for both architectures to install
into the same path. Warn and suggest LOCAL_MODULE_RELATIVE_PATH.
Change-Id: I16208ccada6d43a26a342af35096f49d8df26e81
Colin Cross [Sat, 25 Jan 2014 03:23:40 +0000 (19:23 -0800)]
Support LOCAL_MODULE_RELATIVE_PATH
Most users of LOCAL_MODULE_PATH are setting a subdirectory of the
normal install path, for example to install HALs into system/lib/hw.
This is problematic for multiarch builds, where the install location
depends on the arch. Allow modules to specify LOCAL_MODULE_RELATIVE_PATH.
HALs will generally use:
LOCAL_MODULE_RELATIVE_PATH := hw
Change-Id: I4e4ceec61d026bbe74ba604554c06104bde42e5e
Andrew Boie [Fri, 13 Dec 2013 22:28:53 +0000 (14:28 -0800)]
collect_gpl_sources.mk: Declare rule to assemble GPL sources FORCE
We have no rigorous way to detect whether the code referenced for this
mechanism changes in between builds. So declare this as a phony target
so that it is rebuilt every time.
Change-Id: Ie1670d96895719d406e7b0defd53ba3cd224dd83
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
Ying Wang [Mon, 27 Jan 2014 19:49:25 +0000 (19:49 +0000)]
am
3512ed49: am
f2777de6: am
18294fbf: Merge "Support arch-specific LOCAL_C_INCLUDES."
* commit '
3512ed49a0cecd103de62eb9869e60dab144a6fb':
Support arch-specific LOCAL_C_INCLUDES.
Ying Wang [Mon, 27 Jan 2014 19:30:25 +0000 (19:30 +0000)]
am
f2777de6: am
18294fbf: Merge "Support arch-specific LOCAL_C_INCLUDES."
* commit '
f2777de63984114f30a3d4d73bacd8e4059ea5ea':
Support arch-specific LOCAL_C_INCLUDES.
Ying Wang [Mon, 27 Jan 2014 19:20:13 +0000 (11:20 -0800)]
am
18294fbf: Merge "Support arch-specific LOCAL_C_INCLUDES."
* commit '
18294fbf8c133aaaa5a97a6f36ab92d41aa8e13a':
Support arch-specific LOCAL_C_INCLUDES.