OSDN Git Service
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:32:23 +0000 (00:32 +0000)]
Merge "Make libart the default runtime"
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: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: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:00:19 +0000 (00:00 +0000)]
Merge "Remove libthread_db from the default include 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
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: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 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 18:28:35 +0000 (18:28 +0000)]
Merge "Support arch-specific LOCAL_C_INCLUDES."
Ying Wang [Mon, 27 Jan 2014 18:27:19 +0000 (10:27 -0800)]
Support arch-specific LOCAL_C_INCLUDES.
Bug:
11654773
Change-Id: I89c7ce7ff8bea15cb81f9cd9b0188b54beed3422
Takeshi Kanemoto [Thu, 14 Nov 2013 08:20:50 +0000 (17:20 +0900)]
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
Colin Cross [Sat, 25 Jan 2014 00:46:33 +0000 (00:46 +0000)]
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
Colin Cross [Fri, 24 Jan 2014 21:37:07 +0000 (13:37 -0800)]
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
Colin Cross [Fri, 24 Jan 2014 21:34:51 +0000 (13:34 -0800)]
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
Colin Cross [Fri, 24 Jan 2014 21:33:39 +0000 (13:33 -0800)]
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
Ying Wang [Fri, 24 Jan 2014 21:45:49 +0000 (21:45 +0000)]
Merge "build: print module that has unhandled install path"
Colin Cross [Thu, 23 Jan 2014 01:34:28 +0000 (17:34 -0800)]
build: print module that has unhandled install path
Print the name of the module that is providing an unhandled install
path.
Change-Id: I0e8b02f01de1dde715f0985034ad943f793218ba
Conflicts:
core/base_rules.mk
Ying Wang [Fri, 24 Jan 2014 21:42:42 +0000 (21:42 +0000)]
Merge "build: use correct arm vs thumb arguments for 2nd arch builds"
Colin Cross [Thu, 23 Jan 2014 01:36:05 +0000 (17:36 -0800)]
build: use correct arm vs thumb arguments for 2nd arch builds
Set arm_objects_mode and normal_objects_mode when building a
module for arm when it is the 2nd arch.
Change-Id: I5f7df519b6e1dde6cbf92d106681f07a58e1f1f2
Ying Wang [Fri, 24 Jan 2014 21:41:25 +0000 (21:41 +0000)]
Merge "build: use arm kernel headers for arm 2nd arch builds"
Colin Cross [Wed, 22 Jan 2014 00:54:00 +0000 (16:54 -0800)]
build: use arm kernel headers for arm 2nd arch builds
Compiling for arm requires using the arm kernel headers and not
the aarch64 kernel headers. Add $(combo_2nd_arch_prefix) to get
asm-$(TARGET_2ND_ARCH) when arm is the 2nd arch.
Change-Id: I15270d0ef35e48c034bf4d0d5e35b76f67b2a8e1
Ying Wang [Fri, 24 Jan 2014 21:40:38 +0000 (21:40 +0000)]
Merge "Support arch-specific LOCAL_ variables"
Ying Wang [Fri, 24 Jan 2014 21:40:26 +0000 (21:40 +0000)]
Merge "Make sure to install the .odex when running "make <module_name>""
Ying Wang [Fri, 24 Jan 2014 21:40:12 +0000 (21:40 +0000)]
Merge "Support to build executables for TARGET_2ND_ARCH"
Ying Wang [Fri, 24 Jan 2014 21:39:59 +0000 (21:39 +0000)]
Merge "Replace all references to LOCAL_GENERATED_SOURCES with my_generated_sources"
Ying Wang [Fri, 24 Jan 2014 21:39:48 +0000 (21:39 +0000)]
Merge "Set up rules to build shared libraries for TARGET_2ND_ARCH"
Ying Wang [Fri, 24 Jan 2014 21:39:29 +0000 (21:39 +0000)]
Merge "Set up rules to build static libraries for TARGET_2ND_ARCH"
Ying Wang [Fri, 24 Jan 2014 21:39:14 +0000 (21:39 +0000)]
Merge "Load compiler environment for a second arch."
Ying Wang [Thu, 23 Jan 2014 23:09:04 +0000 (15:09 -0800)]
Support arch-specific LOCAL_ variables
With those variables, you can set up different values for TARGET_ARCH
and TARGET_2ND_ARCH.
Also fixed a couple of variables.
Bug:
11654773
Change-Id: I4c7684a562cd5877d18f67d4f848b8df07d0103b
Conflicts:
core/base_rules.mk
Ying Wang [Thu, 23 Jan 2014 00:50:21 +0000 (16:50 -0800)]
Make sure to install the .odex when running "make <module_name>"
Change-Id: I64195294dad15b7d379d667f4c4738c2808fd384
Ying Wang [Sat, 18 Jan 2014 00:17:28 +0000 (16:17 -0800)]
Support to build executables for TARGET_2ND_ARCH
By default, an executable is built for TARGET_ARCH.
To build it for TARGET_2ND_ARCH in a 64bit product, use:
LOCAL_32BIT_ONLY := true
To skip a module for TARGET_2ND_ARCH, use:
LOCAL_NO_2ND_ARCH := true
Bug:
11654773
Change-Id: Ieb293d25b21024bfe1b554044df338e064ac7b46
Ying Wang [Fri, 17 Jan 2014 00:21:03 +0000 (16:21 -0800)]
Replace all references to LOCAL_GENERATED_SOURCES with my_generated_sources
Now the RS generated sources are only appended to my_generated_sources.
Bug:
11654773
Change-Id: If8dbf3c08fed0b9945dd32b8c809331c17c4bc85
Ying Wang [Thu, 16 Jan 2014 20:36:34 +0000 (12:36 -0800)]
Set up rules to build shared libraries for TARGET_2ND_ARCH
The rules for the 2nd arch are set up in the second inclusion
of shared_library_internal.mk.
Intermediate fils of libfoo of the 2nd arch will be built into
$(PRODUCT_OUT)/obj_$(TARGET_2ND_ARCH)/SHARED_LIBRARIES/libfoo_intermediates/
and the built libfoo.so will be in
$(PRODUCT_OUT)/obj_$(TARGET_2ND_ARCH)/lib.
Bug:
11654773
Change-Id: I58bbe5a05a65f63bce6279131552f3792000716e
Ying Wang [Thu, 16 Jan 2014 00:02:16 +0000 (16:02 -0800)]
Set up rules to build static libraries for TARGET_2ND_ARCH
The rules for the 2nd arch are set up in the second inclusion
of static_library_internal.mk.
libfoo of the 2nd arch will be built into
$(PRODUCT_OUT)/obj_$(TARGET_2ND_ARCH)/libfoo_intermediates/libfoo.a.
Bug:
11654773
Change-Id: I1d92733968fc442e9225b4df5bd1b551a81d89f7
Ying Wang [Fri, 27 Dec 2013 19:09:36 +0000 (11:09 -0800)]
Load compiler environment for a second arch.
This is the first step to build 32-bit libraries in a 64-bit product.
It will work like this:
1) In the product's BoardConfig.mk, define:
TARGET_2ND_ARCH, TARGET_2ND_ARCH_VARIANT, TARGET_2ND_CPU_VARIANT.
The build system uses those variables to set up an additional compiler
environment for the second arch.
2) When parsing Android.mks, the build system sets up rules to build a
module for both the 1st arch and the 2nd arch, unless it's explicitly
asked to skip so.
Android.mk will be adapted if there is additional rule of generating
source files.
The build system will accept arch-specific LOCAL_ variables, such as
LOCAL_CFLAGS_arm, LOCAL_CFLAGS_armv7-a-neon, LOCAL_CFLAGS_cortex-a15,
LOCAL_CFLAGS_aarch64 etc. Modules use such variables to set up build for
various archs at the same time.
3) Install binary of the 2nd arch by adding "<module_name>:32" to
PRODUCT_PACKAGES. All 2nd-arch libraries linked in by "<module_name>:32"
will be installed automatically.
Bug:
11654773
Change-Id: I2df63cd5463a07bf5358bee2a109f8fb9590fe30
Conflicts:
core/combo/TARGET_linux-arm.mk
Colin Cross [Fri, 24 Jan 2014 20:33:59 +0000 (20:33 +0000)]
Merge "build: rename aarch64 target to arm64"
Colin Cross [Wed, 22 Jan 2014 03:35:38 +0000 (19:35 -0800)]
build: rename aarch64 target to arm64
Rename aarch64 build targets to arm64. The gcc toolchain is still
aarch64.
Change-Id: Ia92d8a50824e5329cf00fd6f4f92eae112b7f3a3
David Turner [Fri, 24 Jan 2014 05:33:08 +0000 (05:33 +0000)]
Merge "Vibra: compile and stage vibrator.default on all targets"
David Turner [Fri, 24 Jan 2014 05:32:54 +0000 (05:32 +0000)]
Merge "Vibra: emulator: compile and stage vibrator.goldfish"
Ying Wang [Wed, 22 Jan 2014 20:30:06 +0000 (20:30 +0000)]
Merge "Make jgrep, cgrep, resgrep not recurse into 'out' directory."
Narayan Kamath [Wed, 22 Jan 2014 10:44:48 +0000 (10:44 +0000)]
Merge "Make envsetup.sh set JAVA_HOME correctly for java7."
Narayan Kamath [Fri, 17 Jan 2014 10:05:25 +0000 (10:05 +0000)]
Make envsetup.sh set JAVA_HOME correctly for java7.
Note that despite the location of this change, this function
is run only during "lunch" and not during ". build/envsetup.sh"
Also, make it easier to switch back and forth between java6 and 7
on the same session.
bug:
8992787
Change-Id: I56ec0ba8552b46c04204a8b96b9abc0180f7605f
Ying Wang [Wed, 22 Jan 2014 03:48:59 +0000 (03:48 +0000)]
Merge "Revert "Fix filter rule when checking for apks in PRODUCT_COPY_FILES.""
Ying Wang [Wed, 22 Jan 2014 03:48:27 +0000 (03:48 +0000)]
Revert "Fix filter rule when checking for apks in PRODUCT_COPY_FILES."
This reverts commit
ca37190711ca48a6bfd6b5700a54cd580abd1e5b.
Change-Id: I3a76f4cdf92ecbe3059bf5856cf341874e1393cf
Ying Wang [Tue, 21 Jan 2014 20:31:31 +0000 (20:31 +0000)]
Merge "Fix filter rule when checking for apks in PRODUCT_COPY_FILES."
Ying Wang [Tue, 21 Jan 2014 19:47:51 +0000 (19:47 +0000)]
Merge "Add missing paren in "java -version" check"
Brian Carlstrom [Tue, 21 Jan 2014 07:48:45 +0000 (23:48 -0800)]
Add missing paren in "java -version" check
Change-Id: Id66e795423e8d25b48ac996956748a93060ea5db
Robert Craig [Fri, 17 Jan 2014 14:13:50 +0000 (09:13 -0500)]
Fix filter rule when checking for apks in PRODUCT_COPY_FILES.
PRODUCT_COPY_FILES entries can include the src:dest:owner
syntax versus src:dest. This causes the filter to miss
certain cases. Instead use the word-colon function to
grab the dest regardless of syntax.
Change-Id: I1f4e57a236c1db148bada0cfe5bd1e87bb1194d6
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
Ying Wang [Thu, 16 Jan 2014 01:02:58 +0000 (01:02 +0000)]
Merge "[MIPS] Reenable linker fatal-warnings"
Chris Dearman [Wed, 15 Jan 2014 06:35:13 +0000 (22:35 -0800)]
[MIPS] Reenable linker fatal-warnings
Change-Id: I4efbb7d0b1026b49a9b8bf968dd4752fca8a543b
Ben Cheng [Wed, 15 Jan 2014 00:01:12 +0000 (00:01 +0000)]
Merge "Add aosp_aarch64-eng to the default lunch menu."
Ben Cheng [Tue, 14 Jan 2014 23:55:03 +0000 (15:55 -0800)]
Add aosp_aarch64-eng to the default lunch menu.
Change-Id: I55f6ab6ea90670def30796fdce76c27031ecef01
Ying Wang [Tue, 14 Jan 2014 23:33:34 +0000 (23:33 +0000)]
Merge "Remove aprof support from the build system."
Ying Wang [Tue, 14 Jan 2014 22:26:05 +0000 (14:26 -0800)]
Remove aprof support from the build system.
This reverts the commit
70dc3e1d.
Change-Id: I480b005579805d2608d05dac41e32bb44642e813
Ying Wang [Tue, 14 Jan 2014 20:03:19 +0000 (20:03 +0000)]
Merge "Install 64-bit libraries to /system/lib64."
Ying Wang [Tue, 14 Jan 2014 00:14:20 +0000 (16:14 -0800)]
Install 64-bit libraries to /system/lib64.
/system/lib always contains 32-bit libraries, and /system/lib64 (if
present) always contains 64-bit libraries.
Move things around a little bit, so TARGET_ARCH can be used to define
the build paths.
Bug:
11654773
Change-Id: I2edd91e162c7a20d7719d7bae15e5fa6c2a5b498
Elliott Hughes [Sat, 11 Jan 2014 00:41:24 +0000 (00:41 +0000)]
Merge "Remove obsolete CUSTOM_KERNEL_HEADERS."
Elliott Hughes [Sat, 11 Jan 2014 00:35:08 +0000 (16:35 -0800)]
Remove obsolete CUSTOM_KERNEL_HEADERS.
Change-Id: Id260dd351b90f065eee56e231d4c341b18c1b27f
Ying Wang [Fri, 10 Jan 2014 17:33:12 +0000 (17:33 +0000)]
Merge "Fix x86_64 build"
Pavel Chupin [Fri, 10 Jan 2014 15:23:08 +0000 (19:23 +0400)]
Fix x86_64 build
Issue introduced here:
https://android-review.googlesource.com/#/c/71842/
Change-Id: I8a60641ff07173fcedf259df89aaaa4bc6d6ea3e
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
David Wagner [Mon, 30 Dec 2013 13:30:37 +0000 (14:30 +0100)]
Vibra: compile and stage vibrator.default on all targets
Add the vibrator.default package to all targets deriving from
generic_no_telephony, i.e. virtually all targets.
This change is related to other changes in:
- hardware/libhardware
- hardware/libhardware_legacy
- frameworks/base
- device/generic/goldfish
Change-Id: Ic8464844e12f7d31ca49597dfc4995b13e9ff419
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Signed-off-by: David Wagner <david.wagner@intel.com>
Author-tracking-BZ: 94611
Brian Carlstrom [Fri, 10 Jan 2014 02:31:25 +0000 (02:31 +0000)]
Merge "Add support for ALTERNATE_JAVAC"
Ying Wang [Fri, 10 Jan 2014 00:27:51 +0000 (00:27 +0000)]
Merge "Define PRIVATE_TARGET_ variables for only target modules."
Brian Carlstrom [Thu, 9 Jan 2014 23:33:06 +0000 (15:33 -0800)]
Add support for ALTERNATE_JAVAC
Bug:
12476356
Change-Id: Idd013031dc32a560bca76cca295bedcad55982b4
Ying Wang [Thu, 9 Jan 2014 22:39:41 +0000 (14:39 -0800)]
Define PRIVATE_TARGET_ variables for only target modules.
Change-Id: I12c54bfffd9acb78a61d1032a087a0edaf3bf12c
Ying Wang [Thu, 9 Jan 2014 18:52:06 +0000 (18:52 +0000)]
Merge "Allow clang to build host binaries."
Narayan Kamath [Wed, 8 Jan 2014 09:59:55 +0000 (09:59 +0000)]
Merge "Remove libSR_AudioIn from base.mk"
Ying Wang [Wed, 8 Jan 2014 00:45:15 +0000 (00:45 +0000)]
Merge "PRODUCT_BOOT_JARS as a list of jar names separated by space"
Ying Wang [Tue, 7 Jan 2014 22:31:49 +0000 (14:31 -0800)]
PRODUCT_BOOT_JARS as a list of jar names separated by space
This makes it easier for OEMs to extend the PRODUCT_BOOT_JARS in their
product configuration files.
Change-Id: I5feca2f808b1914c275f28c7a4c38cca2ba6851f
Narayan Kamath [Tue, 7 Jan 2014 10:06:13 +0000 (10:06 +0000)]
Remove libSR_AudioIn from base.mk
This is an obsolete rule that was grandfathered in because
it was a USER module at some point. It's no longer
required, even by builds that use packages/app/VoiceDialer.
Change-Id: Ife9e89bd1b03c0364e27650863a83bad945b8089
Logan Chien [Tue, 10 Dec 2013 11:07:41 +0000 (19:07 +0800)]
Allow clang to build host binaries.
Change-Id: I7e4f9dc6f69a97cfefdfa2ed55c5d7b8ad496da7
Ying Wang [Sat, 4 Jan 2014 01:54:02 +0000 (01:54 +0000)]
Merge "Remove LOCAL_SRC_FILES as precondition of enabling dexpreopt"
Ying Wang [Sat, 4 Jan 2014 00:24:56 +0000 (16:24 -0800)]
Remove LOCAL_SRC_FILES as precondition of enabling dexpreopt
Because a library or app can be built from mere static libraries,
or generated java files. For example, framework is built from only
static library framework-base but without LOCAL_SRC_FILES.
Also added framework2 to PRODUCT_PACKAGES.
Previously framework2.jar was installed by dependency explicitly
established in frameworks/base/Android.mk. That's not enough for the
.odex file.
This fixed the boot failure reported in bug
12382916.
Bug:
12382916
Change-Id: If1a70261ab2bb7fef77cf7b7b995bdc029be0fc3
Nick Kralevich [Thu, 2 Jan 2014 19:50:09 +0000 (19:50 +0000)]
Merge "Allow execmem and ashmem_device execute as required."
David Wagner [Mon, 25 Mar 2013 14:33:34 +0000 (15:33 +0100)]
Vibra: emulator: compile and stage vibrator.goldfish
Following the new vibrator hardware module implementation, the
goldfish vibrator module is no longer integrated in the default
vibrator implementation and therefore needs to be explicitly built
for the emulator.
This patch is related to others in:
- hardware/libhardware
- hardware/libhardware_legacy
- frameworks/base
- device/generic/goldfish
Change-Id: I844279f5535289f079d412fdc44c5cb3c9c1130c
Signed-off-by: David Wagner <david.wagner@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 94611
Ying Wang [Fri, 27 Dec 2013 20:41:02 +0000 (20:41 +0000)]
Merge "e2fsck missing from emulator"
Eric Frohnhoefer [Fri, 27 Dec 2013 04:02:34 +0000 (23:02 -0500)]
e2fsck missing from emulator
The emulator file system was recently switched to ext4 however, e2fsck was not
added to the emulator build.
Change-Id: I94621c148fa40d6042b5c86a26815d867a417a6c
See: https://code.google.com/p/android/issues/detail?id=64144
Stephen Smalley [Tue, 24 Dec 2013 16:34:28 +0000 (11:34 -0500)]
Allow execmem and ashmem_device execute as required.
bootanim requires execmem.
bootanim and surfaceflinger requires execute to ashmem_device.
Change-Id: I3b4964c5acd31a44ce81672077c70353a375c072
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
Elliott Hughes [Fri, 20 Dec 2013 23:53:32 +0000 (23:53 +0000)]
Merge "Remove a non-existent directory from the include path."
Elliott Hughes [Fri, 20 Dec 2013 23:37:55 +0000 (15:37 -0800)]
Remove a non-existent directory from the include path.
Brings aarch64 in line with the other architectures.
Change-Id: Iba3fd33e34e3b5bc071f55cfe09de9e55a023cf7
Nick Kralevich [Fri, 20 Dec 2013 21:01:42 +0000 (21:01 +0000)]
Merge "Add policy for x86 emulator."
Stephen Smalley [Fri, 20 Dec 2013 18:26:11 +0000 (13:26 -0500)]
Add policy for x86 emulator.
Ying Wang [Thu, 19 Dec 2013 23:42:28 +0000 (23:42 +0000)]
Merge "envsetup.sh: cd to toplevel in get_build_var"
Andrew Boie [Thu, 19 Dec 2013 21:21:46 +0000 (13:21 -0800)]
envsetup.sh: cd to toplevel in get_build_var
dumpvar doesn't work right if we're not called from the toplevel;
due to the way the build system works internally, -C does not
suffice. This was already done in get_abs_build_var.
Redundant -C calls removed since we're at the toplevel already.
Change-Id: Iaaa48982547d099186922cc3ddc417a82c85e9a5
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
Elliott Hughes [Wed, 18 Dec 2013 23:31:46 +0000 (23:31 +0000)]
Merge "Fix aarch64 and x86-64 AndroidConfig.h."
Elliott Hughes [Wed, 18 Dec 2013 23:17:42 +0000 (15:17 -0800)]
Fix aarch64 and x86-64 AndroidConfig.h.
_LARGEFILE_SOURCE should never be defined with bionic.
_FILE_OFFSET_BITS should be 64 on 64-bit architectures.
Change-Id: I7acf6b39a3af7782d5d7ad00f709593d96fa8522
Ying Wang [Wed, 18 Dec 2013 18:51:50 +0000 (18:51 +0000)]
Merge "Simplify the calculation of LOCAL_UNSTRIPPED_PATH"