Commit Graph

14929 Commits

Author SHA1 Message Date
Ying Wang 960d919e81 resolved conflicts for merge of 4df82b3e to klp-dev-plus-aosp
Change-Id: I7a1d9e1954ede06a818814bd05a77c69f1ed3bc6
2014-02-08 10:31:46 -08:00
Mihail Dumitrescu 4df82b3e30 Allow proguarding the main app and the test app in a single run.
Bug: 12895101
Change-Id: I6804d73306a164d3e3ec0cab4743f9582b5ef2cf
2014-02-07 19:11:24 +00:00
Scott Main a6e8c6c1e0 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
2014-01-29 20:11:48 +00:00
Scott Main f72e184689 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
2014-01-29 20:08:49 +00:00
Scott Main c9e142e62d Merge "add 'get started' link to the bottom of class home pages" into klp-docs 2014-01-29 20:07:13 +00:00
Elliott Hughes e7bd4f5cdf am 472a4858: Merge "gtest needs -lpthread."
* commit '472a48585ec1cfb66c5716f85b0efdf528b29f5d':
  gtest needs -lpthread.
2014-01-29 01:50:34 +00:00
Elliott Hughes 472a48585e Merge "gtest needs -lpthread." 2014-01-29 01:45:17 +00:00
Elliott Hughes 52e52d1447 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
2014-01-28 17:32:30 -08:00
Brian Carlstrom cba215dd32 am d21197d5: Merge "Make libart the default runtime"
* commit 'd21197d50caaa025bd823a004984a2820bb3c2e2':
  Make libart the default runtime
2014-01-29 00:39:45 +00:00
Brian Carlstrom d21197d50c Merge "Make libart the default runtime" 2014-01-29 00:32:23 +00:00
Elliott Hughes 1a0e850141 am 1a731adf: Merge "Fix KERNEL_HEADERS_ARCH for mips and x86."
* commit '1a731adf943bc716cc7b9c95b321db02ad7216db':
  Fix KERNEL_HEADERS_ARCH for mips and x86.
2014-01-28 21:29:52 +00:00
Elliott Hughes 1a731adf94 Merge "Fix KERNEL_HEADERS_ARCH for mips and x86." 2014-01-28 21:23:07 +00:00
Elliott Hughes 171e940c7a 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
2014-01-28 13:10:19 -08:00
Brian Carlstrom d3737d07c8 am 49eb4409: Merge "build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA"
* commit '49eb440980db6680ec08c48b416e37e937bf9003':
  build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA
2014-01-28 20:50:19 +00:00
Brian Carlstrom 49eb440980 Merge "build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA" 2014-01-28 20:45:32 +00:00
Brian Carlstrom 8fb5dfc5c7 build: PRODUCT_DEX_PREOPT_IMAGE_IN_DATA
(cherry-picked from commit cd337c71ee65b17529a67af34d4c0b2824a4f175)

Change-Id: I6d8ab3b3cf52f6a6b15f1c8e8d00cdf59042436b
2014-01-28 11:29:58 -08:00
Brian Carlstrom 08d410f532 Make libart the default runtime
Change-Id: I4394f2bdef6f1be36f0f17f3b42d3e62bc2245ef
2014-01-28 09:52:15 -08:00
Colin Cross 0d24616dd1 am cdd14758: Merge "Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS"
* commit 'cdd1475834156b2e45b73ae86a949efa6c1215eb':
  Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS
2014-01-28 02:31:18 +00:00
Colin Cross cdd1475834 Merge "Add support for TARGET_GLOBAL_UNSUPPORTED_CFLAGS" 2014-01-28 02:25:45 +00:00
Colin Cross 8f47fc379e 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
2014-01-27 18:21:12 -08:00
Elliott Hughes 4fbf23ef82 am 0a3cf1a0: Merge "Remove libthread_db from the default include path."
* commit '0a3cf1a0e5c6dbe132c1dc5e13293960c5e7b103':
  Remove libthread_db from the default include path.
2014-01-28 00:43:29 +00:00
Elliott Hughes 0a3cf1a0e5 Merge "Remove libthread_db from the default include path." 2014-01-28 00:00:19 +00:00
Ying Wang 04cff70804 resolved conflicts for merge of 7382ec7d to klp-dev-plus-aosp
Change-Id: Ic414d3ec8b52b1045125e1b76deae8a4a59a5e52
2014-01-27 15:56:45 -08:00
Elliott Hughes 2f8dcdd961 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
2014-01-27 15:45:17 -08:00
Colin Cross ae49acbde7 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
2014-01-27 15:40:22 -08:00
Ying Wang 7382ec7db8 Merge "ota_from_target_files: Add an option to not sign OTA packages" 2014-01-27 23:37:18 +00:00
Colin Cross 1acb1b64b9 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
2014-01-27 23:35:01 +00:00
Ying Wang 50c548c8f4 am 25a16fe8: Merge "Don\'t modify LOCAL_MODULE_TAGS."
* commit '25a16fe80ee7795c4763045061779f3c7068813d':
  Don't modify LOCAL_MODULE_TAGS.
2014-01-27 15:25:35 -08:00
Ying Wang 25a16fe80e Merge "Don't modify LOCAL_MODULE_TAGS." 2014-01-27 23:20:06 +00:00
Ying Wang 37bd1f2d83 Don't modify LOCAL_MODULE_TAGS.
Change-Id: Id70d48c1d7abf02139925bcb3208515ea1a082b9
2014-01-27 15:19:09 -08:00
Ying Wang 0105f1cc9a 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
2014-01-27 14:57:57 -08:00
Ying Wang 07b16c0d5b Merge "collect_gpl_sources.mk: Declare rule to assemble GPL sources FORCE" 2014-01-27 22:52:14 +00:00
Colin Cross d826264621 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
2014-01-27 14:45:44 -08:00
Colin Cross d0378b3f2d 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
2014-01-27 14:43:24 -08:00
Colin Cross 639c336dc1 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
2014-01-27 14:43:14 -08:00
Andrew Boie f3ec9ed045 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>
2014-01-27 12:25:43 -08:00
Ying Wang f2777de639 am 18294fbf: Merge "Support arch-specific LOCAL_C_INCLUDES."
* commit '18294fbf8c133aaaa5a97a6f36ab92d41aa8e13a':
  Support arch-specific LOCAL_C_INCLUDES.
2014-01-27 11:20:13 -08:00
Ying Wang 18294fbf8c Merge "Support arch-specific LOCAL_C_INCLUDES." 2014-01-27 18:28:35 +00:00
Ying Wang dbdafdb865 Support arch-specific LOCAL_C_INCLUDES.
Bug: 11654773
Change-Id: I89c7ce7ff8bea15cb81f9cd9b0188b54beed3422
2014-01-27 10:27:19 -08:00
Takeshi Kanemoto e153b34643 ota_from_target_files: Add an option to not sign OTA packages
Sometimes it is useful to be able to tell ota_from_target_files
to not sign the output zip file. For instance, the private
release key may not be available when ota_from_target_files
is executed; similarly the release tools may not be available
or executable where the private key is stored.

This change adds an option, '--no_signing', to simply output the
unsigned OTA zip file, instead of spuriously signing it with the
test key even though the zip file would need to be re-signed later
with a different key.

Change-Id: I1f3c4dc8ffa35ce85478f848b147aff3d40fe283
2014-01-27 15:01:04 +09:00
Colin Cross 4a1f42d70e am 7c7f28e7: Merge changes Ib1d950e1,I3d020a3c,Ic9594718
* commit '7c7f28e71044ca04d368dec626faba37fe74818d':
  Add 2nd arch directories for apps
  Set up rules to build prebuilts for TARGET_2ND_ARCH
  Set up rules to build packages for TARGET_2ND_ARCH
2014-01-24 16:52:14 -08:00
Colin Cross 7c7f28e710 Merge changes Ib1d950e1,I3d020a3c,Ic9594718
* changes:
  Add 2nd arch directories for apps
  Set up rules to build prebuilts for TARGET_2ND_ARCH
  Set up rules to build packages for TARGET_2ND_ARCH
2014-01-25 00:46:33 +00:00
Colin Cross d9574462d8 Add 2nd arch directories for apps
Apps built for 2nd arch install in the same directories as when
built for the 1st arch.

Change-Id: Ib1d950e186eef88212b44d04e6bc6c30a3d56155
2014-01-24 16:44:06 -08:00
Colin Cross 0b70c4374c Set up rules to build prebuilts for TARGET_2ND_ARCH
Prebuilts built for the 2nd arch will install into 2nd arch
directories.

Change-Id: I3d020a3c1fb0f2eb0579933f8a66e410e66fdd44
2014-01-24 16:44:02 -08:00
Colin Cross 2343cfbe3d Set up rules to build packages for TARGET_2ND_ARCH
Packages built for the 2nd arch will depend on jni libraries
build for the 2nd arch.

Change-Id: Ic9594718849b2577920c500c35d46150eb948c8d
2014-01-24 16:04:19 -08:00
Ying Wang 5cc096b73b am 2c0260ab: Merge "build: print module that has unhandled install path"
* commit '2c0260abc7099c79646928cc5a60eeba282736ad':
  build: print module that has unhandled install path
2014-01-24 13:53:47 -08:00
Ying Wang f34c4c71b8 am 125ddab1: Merge "build: use correct arm vs thumb arguments for 2nd arch builds"
* commit '125ddab1fbf084d25c1fa2c43c735f4ff4636f80':
  build: use correct arm vs thumb arguments for 2nd arch builds
2014-01-24 13:50:20 -08:00
Ying Wang 4e08d3049b am f2044b41: Merge "build: use arm kernel headers for arm 2nd arch builds"
* commit 'f2044b41cf11e584ab5df87b6a11f04ae26c6865':
  build: use arm kernel headers for arm 2nd arch builds
2014-01-24 13:46:57 -08:00
Ying Wang 0c09d5b2ab am e778ec89: Merge "Support arch-specific LOCAL_ variables"
* commit 'e778ec89fd249e15608b7629963619d99e8a34bf':
  Support arch-specific LOCAL_ variables
2014-01-24 13:46:56 -08:00
Ying Wang 23752157bc am 3beb831c: Merge "Make sure to install the .odex when running "make <module_name>""
* commit '3beb831c79b6051e881d17979981a846259bcd99':
  Make sure to install the .odex when running "make <module_name>"
2014-01-24 13:46:55 -08:00