Commit graph

14823 commits

Author SHA1 Message Date
Ben Cheng
1703474f4c am 365e4439: Merge "Add aosp_aarch64-eng to the default lunch menu."
* commit '365e443995b2b33eae23ff0423a042eb52e64326':
  Add aosp_aarch64-eng to the default lunch menu.
2014-01-14 16:08:43 -08: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
14af5526b5 am c4c71f06: Merge "Remove aprof support from the build system."
* commit 'c4c71f06ab002c4b12042ba7752272311b62b0f9':
  Remove aprof support from the build system.
2014-01-14 15:36:57 -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
b6c570510a am f5ce4fa9: Merge "Install 64-bit libraries to /system/lib64."
* commit 'f5ce4fa983f08d42bbc5d96af4f86bce5c190f0c':
  Install 64-bit libraries to /system/lib64.
2014-01-14 12:08:32 -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
dda9d8ee0f am 37c699c2: Merge "Remove obsolete CUSTOM_KERNEL_HEADERS."
* commit '37c699c28a464561b186ab11a5af60214ae25d9a':
  Remove obsolete CUSTOM_KERNEL_HEADERS.
2014-01-10 16:47:30 -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
0650d4a2ea am 987616ed: Merge "Fix x86_64 build"
* commit '987616ed09adc65e6636f7a3a82fa7b38021b6e2':
  Fix x86_64 build
2014-01-10 09:38:13 -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
Brian Carlstrom
98c7252113 am ad8271a8: Merge "Add support for ALTERNATE_JAVAC"
* commit 'ad8271a8e6a1f050c1852d6dc3df0eb6777e5606':
  Add support for ALTERNATE_JAVAC
2014-01-09 18:36:22 -08:00
Brian Carlstrom
ad8271a8e6 Merge "Add support for ALTERNATE_JAVAC" 2014-01-10 02:31:26 +00:00
Ying Wang
cb5f9a282e am a26ea82e: Merge "Define PRIVATE_TARGET_ variables for only target modules."
* commit 'a26ea82e6a226575f19fec6b5bea111cbe20c233':
  Define PRIVATE_TARGET_ variables for only target modules.
2014-01-09 16:32:07 -08: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
b5fb7f242e am aed49987: Merge "Allow clang to build host binaries."
* commit 'aed499879210c7432c1c5b3869f383b27b17dafc':
  Allow clang to build host binaries.
2014-01-09 10:57:03 -08:00
Ying Wang
aed4998792 Merge "Allow clang to build host binaries." 2014-01-09 18:52:06 +00:00
Narayan Kamath
6ab8c86b56 am 8530e25f: Merge "Remove libSR_AudioIn from base.mk"
* commit '8530e25ff666987c7c968c2a323a8b1e7867bcca':
  Remove libSR_AudioIn from base.mk
2014-01-08 02:05:12 -08:00
Narayan Kamath
8530e25ff6 Merge "Remove libSR_AudioIn from base.mk" 2014-01-08 09:59:56 +00:00
Ying Wang
95fc1a5075 am f12d4810: Merge "PRODUCT_BOOT_JARS as a list of jar names separated by space"
* commit 'f12d48104ba782d877afc31a081748fdc881f2b6':
  PRODUCT_BOOT_JARS as a list of jar names separated by space
2014-01-07 16:50:49 -08: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
f05eecc368 am a47d12e3: Merge "Remove LOCAL_SRC_FILES as precondition of enabling dexpreopt"
* commit 'a47d12e38ae38a6fdceb54172490c94408efa0de':
  Remove LOCAL_SRC_FILES as precondition of enabling dexpreopt
2014-01-03 17:59:59 -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
0ce68b3853 am 6e8ffe3f: Merge "Allow execmem and ashmem_device execute as required."
* commit '6e8ffe3f1e328ee71354b539e63b34b2342160a8':
  Allow execmem and ashmem_device execute as required.
2014-01-02 11:54:59 -08:00
Nick Kralevich
6e8ffe3f1e Merge "Allow execmem and ashmem_device execute as required." 2014-01-02 19:50:10 +00:00
Ying Wang
06d914c841 am d23bd8f5: Merge "e2fsck missing from emulator"
* commit 'd23bd8f59f396ecd23a54d4e9b798bc872a2e505':
  e2fsck missing from emulator
2013-12-27 12:46:31 -08: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
Michael Runge
41e19a4cf0 am 6b55f007: am facd992e: Makefile used spaces instead of a tab
* commit '6b55f00762c03b3625862b89f704090f58f970e7':
  Makefile used spaces instead of a tab
2013-12-26 15:33:32 -08:00
Michael Runge
5636d07a29 am a80542db: am 4038aa8f: Enabled incrementals to patch + rename moved files
* commit 'a80542dbf4f193c59525b8749871bcdf4ae4283a':
  Enabled incrementals to patch + rename moved files
2013-12-26 15:33:27 -08: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
9464ca1b97 am b8559790: Merge "Remove a non-existent directory from the include path."
* commit 'b8559790d43f2483c7910e87e33ceebeb40e9bec':
  Remove a non-existent directory from the include path.
2013-12-20 15:57:57 -08: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
da5d54c8ce am dfabbc68: Merge "Add policy for x86 emulator."
* commit 'dfabbc6863494374396a94181c408348824b37ab':
  Add policy for x86 emulator.
2013-12-20 13:06:07 -08:00
Nick Kralevich
dfabbc6863 Merge "Add policy for x86 emulator." 2013-12-20 21:01:42 +00:00
Michael Runge
6b55f00762 am facd992e: Makefile used spaces instead of a tab
* commit 'facd992ec73de763cfbca32dd6aa38ff76a07613':
  Makefile used spaces instead of a tab
2013-12-20 12:36:49 -08:00
Michael Runge
facd992ec7 Makefile used spaces instead of a tab
Change-Id: Ia34f80d99062ef2899527f11d7bf72e78c63e31c
2013-12-20 11:50:16 -08:00
Michael Runge
a80542dbf4 am 4038aa8f: Enabled incrementals to patch + rename moved files
* commit '4038aa8fff8c68733bff8b55d8c8d1b59713ca37':
  Enabled incrementals to patch + rename moved files
2013-12-20 11:35:07 -08:00
Stephen Smalley
737f9a167a Add policy for x86 emulator. 2013-12-20 14:33:55 -05:00