Commit graph

3794 commits

Author SHA1 Message Date
Chet Haase
c888b4f9b6 am 585ce19d: Add recyclerview to support libs docs
* commit '585ce19d9d6b9feac75baa646b507dbd35085f7c':
  Add recyclerview to support libs docs
2014-01-16 17:55:15 +00:00
Chet Haase
585ce19d9d Add recyclerview to support libs docs
Change-Id: Ibe863e4b1930670353e6e0658fbc83e694dec3a4
2014-01-16 15:55:56 +00:00
Ying Wang
2f68fddd07 am 4339ad4a: am da9ef76b: am a296a71e: am 166bc090: Merge "[MIPS] Reenable linker fatal-warnings"
* commit '4339ad4ac1e0170c7c7497c2b3480b2154fcd8ac':
  [MIPS] Reenable linker fatal-warnings
2014-01-16 01:17:22 +00:00
Ying Wang
da9ef76b5d am a296a71e: am 166bc090: Merge "[MIPS] Reenable linker fatal-warnings"
* commit 'a296a71e0c344e95f2d4dfe59d850a55130fe58a':
  [MIPS] Reenable linker fatal-warnings
2014-01-16 01:11:15 +00:00
Ying Wang
a296a71e0c am 166bc090: Merge "[MIPS] Reenable linker fatal-warnings"
* commit '166bc090ab0ac7ac7a620889fd96656be4ca69c1':
  [MIPS] Reenable linker fatal-warnings
2014-01-15 17:08:22 -08:00
Chris Dearman
13eb1eb53d [MIPS] Reenable linker fatal-warnings
Change-Id: I4efbb7d0b1026b49a9b8bf968dd4752fca8a543b
2014-01-15 19:00:37 +00:00
Ying Wang
bf39ddab4c am e6036aa6: am c4f4a532: am 14af5526: am c4c71f06: Merge "Remove aprof support from the build system."
* commit 'e6036aa6ff8cde9fad959ed42bec8cce0350c5e6':
  Remove aprof support from the build system.
2014-01-14 23:47:11 +00:00
Ying Wang
c4f4a5325f am 14af5526: am c4c71f06: Merge "Remove aprof support from the build system."
* commit '14af5526b5001431af49e40be049b5475de64f15':
  Remove aprof support from the build system.
2014-01-14 23:42:33 +00: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
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
734afe4e42 am 94ff79ea: am adc66128: am b6c57051: am f5ce4fa9: Merge "Install 64-bit libraries to /system/lib64."
* commit '94ff79eaf2d66be4c83656a41b4efa38ad34a970':
  Install 64-bit libraries to /system/lib64.
2014-01-14 20:15:45 +00:00
Ying Wang
adc66128dc am b6c57051: am f5ce4fa9: Merge "Install 64-bit libraries to /system/lib64."
* commit 'b6c570510aa1d2747538fe734292873ed13f5b67':
  Install 64-bit libraries to /system/lib64.
2014-01-14 20:10:16 +00: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
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
363948afb1 am 17657ec7: am 538009b2: am dda9d8ee: am 37c699c2: Merge "Remove obsolete CUSTOM_KERNEL_HEADERS."
* commit '17657ec7f71a7be5c71f3b42b217d9ec45079f3b':
  Remove obsolete CUSTOM_KERNEL_HEADERS.
2014-01-11 00:57:27 +00:00
Elliott Hughes
538009b26c am dda9d8ee: am 37c699c2: Merge "Remove obsolete CUSTOM_KERNEL_HEADERS."
* commit 'dda9d8ee0fe580d663a4eaed49be5d39c3de2882':
  Remove obsolete CUSTOM_KERNEL_HEADERS.
2014-01-11 00:50:44 +00: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
48d3e86fb5 am b3681d13: am ee2a10eb: am 0650d4a2: am 987616ed: Merge "Fix x86_64 build"
* commit 'b3681d1351086ba4dffa4752ac2114c7d8915914':
  Fix x86_64 build
2014-01-10 17:45:43 +00:00
Ying Wang
ee2a10eb18 am 0650d4a2: am 987616ed: Merge "Fix x86_64 build"
* commit '0650d4a2eadc96577b2e03fbda000ed5a340d8ac':
  Fix x86_64 build
2014-01-10 17:40:26 +00: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
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
978155b7d0 am 6e984e2d: am 1df8d179: am 98c72521: am ad8271a8: Merge "Add support for ALTERNATE_JAVAC"
* commit '6e984e2d8cfc3ac7affa59e8b7440c8e5fc8b16f':
  Add support for ALTERNATE_JAVAC
2014-01-10 02:42:36 +00:00
Brian Carlstrom
1df8d17911 am 98c72521: am ad8271a8: Merge "Add support for ALTERNATE_JAVAC"
* commit '98c7252113ad4adfc11bb500d737b96c0544106f':
  Add support for ALTERNATE_JAVAC
2014-01-10 02:39:02 +00: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
15cfc9170b am d19496b1: am 02e4bb6b: am cb5f9a28: am a26ea82e: Merge "Define PRIVATE_TARGET_ variables for only target modules."
* commit 'd19496b134ff56167266566920acf93867b8972d':
  Define PRIVATE_TARGET_ variables for only target modules.
2014-01-10 01:54:28 +00:00
Ying Wang
02e4bb6b10 am cb5f9a28: am a26ea82e: Merge "Define PRIVATE_TARGET_ variables for only target modules."
* commit 'cb5f9a282e713096104e9d7b18bb028f926dbd2a':
  Define PRIVATE_TARGET_ variables for only target modules.
2014-01-10 00:34:56 +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
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
cb297d3bd3 Reconcile the merge.
Change-Id: If3edaedc417e390005b83cbf649b5c1f07a2ea82
2014-01-09 11:42:04 -08:00
Ying Wang
6a271ead2f resolved conflicts for merge of 948786c9 to master
Conflicts:
	core/llvm_config.mk

Change-Id: Icfe11ad432c39efdf281ba0ab3cffb1011789cce
2014-01-09 11:18:40 -08:00
Ying Wang
fb5ae89fea am b5fb7f24: am aed49987: Merge "Allow clang to build host binaries."
* commit 'b5fb7f242e925f482557227623120f1e4480beba':
  Allow clang to build host binaries.
2014-01-09 19:00:15 +00: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
Ying Wang
a21b8ea724 am a292b7b0: am 83709a21: am 95fc1a50: am f12d4810: Merge "PRODUCT_BOOT_JARS as a list of jar names separated by space"
* commit 'a292b7b02bdf051df9eebbe4a51c6a55ce91a7a2':
  PRODUCT_BOOT_JARS as a list of jar names separated by space
2014-01-08 01:01:21 +00:00
Ying Wang
83709a21c1 am 95fc1a50: am f12d4810: Merge "PRODUCT_BOOT_JARS as a list of jar names separated by space"
* commit '95fc1a50750f8d0341e10f7ea39d37e3af5b21f3':
  PRODUCT_BOOT_JARS as a list of jar names separated by space
2014-01-08 00:53:31 +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
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
Logan Chien
e6f65438a4 Allow clang to build host binaries.
Change-Id: I7e4f9dc6f69a97cfefdfa2ed55c5d7b8ad496da7
2014-01-07 14:49:20 +08:00
Narayan Kamath
543c043c14 Merge "Fix up android.core CTS tests." 2014-01-06 11:00:32 +00:00
Ying Wang
b86c34ae64 am f05eecc3: am a47d12e3: Merge "Remove LOCAL_SRC_FILES as precondition of enabling dexpreopt"
* commit 'f05eecc3682d3599906e2ff61209e5c191cbf29b':
  Remove LOCAL_SRC_FILES as precondition of enabling dexpreopt
2014-01-04 02:02:39 +00: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
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
Ying Wang
8157cec3e9 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 16:24:56 -08:00
Narayan Kamath
13a3fe86c9 Fix up android.core CTS tests.
Fix several wrongly configured tests that were either
looking for tests in the wrong jar (apache-harmony-tests
instead of core-tests) or using the wrong prefix.

Also, this change creates subsets of the harmony tests based
on subpackage names (java.net, java.io, java.nio etc.) instead
of the earlier harmony groupings.

Change-Id: Iff1978b2654485bfea0fc17221c6e1f62c31b913
2013-12-31 16:08:47 +00:00
Ying Wang
1ff0836ce0 Emma support for host Java libraries.
To run emma on a host Java library, in the module definition use:
LOCAL_EMMA_INSTRUMENT := true
then run make with "EMMA_INSTRUMENT=true".

Bug: 12178695
Change-Id: Ie31582b94f5c45381f534912e810f88d21dde9b2
2013-12-30 09:17:06 -08:00
Michael Runge
d537f93f20 am 4edeba20: am a8e32578: am 41e19a4c: am 6b55f007: am facd992e: Makefile used spaces instead of a tab
* commit '4edeba203d39698d1d7c8ddb1ef7906de630a24f':
  Makefile used spaces instead of a tab
2013-12-26 23:50:26 +00:00