Commit Graph

14808 Commits

Author SHA1 Message Date
Narayan Kamath 9260bba06f 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
2014-01-22 10:41:08 +00:00
Ying Wang 62043de346 Merge "Revert "Fix filter rule when checking for apks in PRODUCT_COPY_FILES."" 2014-01-22 03:48:59 +00:00
Ying Wang 06b3255118 Revert "Fix filter rule when checking for apks in PRODUCT_COPY_FILES."
This reverts commit ca37190711.

Change-Id: I3a76f4cdf92ecbe3059bf5856cf341874e1393cf
2014-01-22 03:48:27 +00:00
Ying Wang 8d1f91fa54 Merge "Fix filter rule when checking for apks in PRODUCT_COPY_FILES." 2014-01-21 20:31:31 +00:00
Ying Wang 6ec3545158 Merge "Add missing paren in "java -version" check" 2014-01-21 19:47:51 +00:00
Brian Carlstrom 0cf57dc99f Add missing paren in "java -version" check
Change-Id: Id66e795423e8d25b48ac996956748a93060ea5db
2014-01-20 23:48:45 -08:00
Robert Craig ca37190711 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>
2014-01-17 09:13:50 -05:00
Ying Wang 166bc090ab Merge "[MIPS] Reenable linker fatal-warnings" 2014-01-16 01:02:58 +00:00
Chris Dearman 13eb1eb53d [MIPS] Reenable linker fatal-warnings
Change-Id: I4efbb7d0b1026b49a9b8bf968dd4752fca8a543b
2014-01-15 19:00:37 +00:00
Ben Cheng 365e443995 Merge "Add aosp_aarch64-eng to the default lunch menu." 2014-01-15 00:01:12 +00:00
Ben Cheng 89ccc4895d Add aosp_aarch64-eng to the default lunch menu.
Change-Id: I55f6ab6ea90670def30796fdce76c27031ecef01
2014-01-14 15:55:03 -08:00
Ying Wang c4c71f06ab Merge "Remove aprof support from the build system." 2014-01-14 23:33:35 +00:00
Ying Wang 4587455075 Remove aprof support from the build system.
This reverts the commit 70dc3e1d.

Change-Id: I480b005579805d2608d05dac41e32bb44642e813
2014-01-14 14:26:05 -08:00
Ying Wang f5ce4fa983 Merge "Install 64-bit libraries to /system/lib64." 2014-01-14 20:03:19 +00:00
Ying Wang c634974d37 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
2014-01-13 16:20:31 -08:00
Elliott Hughes 37c699c28a Merge "Remove obsolete CUSTOM_KERNEL_HEADERS." 2014-01-11 00:41:25 +00:00
Elliott Hughes dddb566eba Remove obsolete CUSTOM_KERNEL_HEADERS.
Change-Id: Id260dd351b90f065eee56e231d4c341b18c1b27f
2014-01-10 16:35:08 -08:00
Ying Wang 987616ed09 Merge "Fix x86_64 build" 2014-01-10 17:33:12 +00:00
Pavel Chupin 522b0a633c 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>
2014-01-10 19:23:08 +04:00
David Wagner 4e0ee6c74a 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
2014-01-10 13:56:20 +01:00
Brian Carlstrom ad8271a8e6 Merge "Add support for ALTERNATE_JAVAC" 2014-01-10 02:31:26 +00:00
Ying Wang a26ea82e6a Merge "Define PRIVATE_TARGET_ variables for only target modules." 2014-01-10 00:27:51 +00:00
Brian Carlstrom b6dcef8777 Add support for ALTERNATE_JAVAC
Bug: 12476356
Change-Id: Idd013031dc32a560bca76cca295bedcad55982b4
2014-01-09 15:33:23 -08:00
Ying Wang 7fff9a1a56 Define PRIVATE_TARGET_ variables for only target modules.
Change-Id: I12c54bfffd9acb78a61d1032a087a0edaf3bf12c
2014-01-09 14:39:41 -08:00
Ying Wang aed4998792 Merge "Allow clang to build host binaries." 2014-01-09 18:52:06 +00:00
Narayan Kamath 8530e25ff6 Merge "Remove libSR_AudioIn from base.mk" 2014-01-08 09:59:56 +00:00
Ying Wang f12d48104b Merge "PRODUCT_BOOT_JARS as a list of jar names separated by space" 2014-01-08 00:45:16 +00:00
Ying Wang ad6674cd60 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
2014-01-07 14:31:49 -08:00
Narayan Kamath 8ef82240e1 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
2014-01-07 10:06:13 +00:00
Logan Chien e6f65438a4 Allow clang to build host binaries.
Change-Id: I7e4f9dc6f69a97cfefdfa2ed55c5d7b8ad496da7
2014-01-07 14:49:20 +08:00
Ying Wang a47d12e38a Merge "Remove LOCAL_SRC_FILES as precondition of enabling dexpreopt" 2014-01-04 01:54:03 +00:00
Ying Wang 9db168ca5c 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
2014-01-03 17:53:00 -08:00
Nick Kralevich 6e8ffe3f1e Merge "Allow execmem and ashmem_device execute as required." 2014-01-02 19:50:10 +00:00
David Wagner 48b4946474 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
2013-12-30 15:45:12 +01:00
Ying Wang d23bd8f59f Merge "e2fsck missing from emulator" 2013-12-27 20:41:02 +00:00
Eric Frohnhoefer 0214b3fa3c 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
2013-12-27 15:30:15 -05:00
Stephen Smalley 61c7107df3 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>
2013-12-24 11:43:25 -05:00
Elliott Hughes b8559790d4 Merge "Remove a non-existent directory from the include path." 2013-12-20 23:53:32 +00:00
Elliott Hughes 26990f5573 Remove a non-existent directory from the include path.
Brings aarch64 in line with the other architectures.

Change-Id: Iba3fd33e34e3b5bc071f55cfe09de9e55a023cf7
2013-12-20 15:37:55 -08:00
Nick Kralevich dfabbc6863 Merge "Add policy for x86 emulator." 2013-12-20 21:01:42 +00:00
Stephen Smalley 737f9a167a Add policy for x86 emulator. 2013-12-20 14:33:55 -05:00
Ying Wang 3ccb437d93 Merge "envsetup.sh: cd to toplevel in get_build_var" 2013-12-19 23:42:28 +00:00
Andrew Boie 6905e2163f 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>
2013-12-19 14:34:23 -08:00
Elliott Hughes 3d3dd4a186 Merge "Fix aarch64 and x86-64 AndroidConfig.h." 2013-12-18 23:31:47 +00:00
Elliott Hughes 98593a66af 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
2013-12-18 15:17:42 -08:00
Ying Wang 8e3a71f75e Merge "Simplify the calculation of LOCAL_UNSTRIPPED_PATH" 2013-12-18 18:51:51 +00:00
Ying Wang f3584968ff Simplify the calculation of LOCAL_UNSTRIPPED_PATH
Also this fixes the LOCAL_UNSTRIPPED_PATH if the module is installed to
the vendor dir via LOCAL_PROPRIETARY_MODULE.

Bug: 11289169
Change-Id: Ib07e5761411210963076487fe0e148c259e1e082
2013-12-18 10:41:01 -08:00
Ying Wang 3fc636c25a Merge "Create the dest dir before copying over files." 2013-12-18 01:40:12 +00:00
Ying Wang 17a7e2bee3 Create the dest dir before copying over files.
Change-Id: I8ad79704558d7a10099e64fc1d032c8ddd3330b9
2013-12-17 17:37:16 -08:00
Ying Wang 71e8a22e34 Merge "Add DEXPREOPT support for ART" 2013-12-18 00:55:28 +00:00