Commit Graph

9311 Commits

Author SHA1 Message Date
Jean-Baptiste Queru 5b7633be4e am 06e515dd: Merge "This patch addresses the following issues:"
* commit '06e515dd77731c1752b2ea3b1b586bcd893f0927':
  This patch addresses the following issues:
2012-06-12 08:02:30 -07:00
Jean-Baptiste Queru 06e515dd77 Merge "This patch addresses the following issues:" 2012-06-12 07:47:49 -07:00
The Android Automerger 3b123c068d JRN72C 2012-06-11 17:17:03 -07:00
The Android Automerger 2715ac8e13 JRN72B 2012-06-11 13:24:52 -07:00
Jamie Gennis f3b1395a41 Merge "Add atrace to core.mk" into jb-dev 2012-06-11 12:04:24 -07:00
The Android Open Source Project 40b72470c1 Reconcile with jb-release
Change-Id: Ib5c6014cd943de49130829c7c7c68eebdaccd1f9
2012-06-11 09:20:38 -07:00
The Android Automerger fc57a28a65 JRN72 2012-06-11 07:09:29 -07:00
The Android Automerger 2367ea65d6 merge in jb-release history after reset to jb-dev 2012-06-11 06:59:30 -07:00
The Android Automerger 18cb32b10e JRN69D 2012-06-08 15:52:35 -07:00
Jamie Gennis a9efae347f Add atrace to core.mk
This change adds the atrace binary and init.trace.rc to the system image for
all builds.

Bug: 6513400
Change-Id: Ib979f4b6ffe799ab56e66fc3acfad754d216c576
2012-06-08 14:59:42 -07:00
The Android Automerger 13a099d47a JRN69C 2012-06-08 14:17:42 -07:00
The Android Automerger 7765a8af65 JRN69B 2012-06-08 11:41:12 -07:00
Eino-Ville Talvala 5b401f8b8b am e245ecdc: Merge "Add LegacyCamera to SDK product" into jb-dev
* commit 'e245ecdc0a87fb198894995ffbc4e6fec8d812f8':
  Add LegacyCamera to SDK product
2012-06-08 09:34:52 -07:00
Eino-Ville Talvala e245ecdc0a Merge "Add LegacyCamera to SDK product" into jb-dev 2012-06-08 09:32:27 -07:00
Ying Wang 5c0ee702d6 am 79d39a30: am 874563f9: Merge "Fix generic build on Max OS X 10.7 Lion"
* commit '79d39a303e036dc70eccf2e2e7489fa0bbfd3a4b':
  Fix generic build on Max OS X 10.7 Lion
2012-06-08 09:27:08 -07:00
Ying Wang 79d39a303e am 874563f9: Merge "Fix generic build on Max OS X 10.7 Lion"
* commit '874563f92e18d54d9088408104cc28d35971f189':
  Fix generic build on Max OS X 10.7 Lion
2012-06-08 09:24:19 -07:00
Ying Wang 874563f92e Merge "Fix generic build on Max OS X 10.7 Lion" 2012-06-08 09:00:06 -07:00
The Android Automerger a63502c8e6 JRN69 2012-06-08 08:27:09 -07:00
The Android Automerger e98b55d0f3 merge in jb-release history after reset to jb-dev 2012-06-08 08:15:37 -07:00
SangWook Han 02eb37c267 Fix generic build on Max OS X 10.7 Lion
Recover variable build_mac_version which is removed on
    commit 644dc16 and added on commit 9ce06f1.

    Without this, ranlib libSDL.a is executed on Lion which
    causes build fail of emulator-arm.

Change-Id: I06144a288921f8f968ef457999398c1b9152d4aa
2012-06-08 14:55:05 +09:00
Keun young Park fe8cddea28 am efe02ce9: add TARGET_BUILD_JAVA_SUPPORT_LEVEL to allow checking if java build is OK in PDK
* commit 'efe02ce9e00b9aebde7e9b32e81780d8de8f0dbd':
  add TARGET_BUILD_JAVA_SUPPORT_LEVEL to allow checking if java build is OK in PDK
2012-06-07 16:31:14 -07:00
The Android Automerger 1f61e09727 JRN68B 2012-06-07 15:55:50 -07:00
Keun young Park efe02ce9e0 add TARGET_BUILD_JAVA_SUPPORT_LEVEL to allow checking if java build is OK in PDK
- three levels: not defined, sdk, platform
- TARGET_BUILD_PDK_JAVA_PLATFORM gives the original meaning of java platform API
  supported for java.mk
- remove libexif from user tag
- libexif_jni is pulled from f/b/media

Bug: 6623618

Change-Id: I5fa085bd10f43963350c57b7f885c700de8963e5
2012-06-07 15:40:53 -07:00
Raphael Moll 748f9e3804 am b53a073d: am e375c940: Merge "SDK: Use "strip -x" for atree."
* commit 'b53a073ddb3a5036f41ea2956792991b7a46da02':
  SDK: Use "strip -x" for atree.
2012-06-07 13:08:58 -07:00
Raphael Moll b53a073ddb am e375c940: Merge "SDK: Use "strip -x" for atree."
* commit 'e375c940b9210ea514227b0ee8cfb896d7f11d93':
  SDK: Use "strip -x" for atree.
2012-06-07 13:06:23 -07:00
Raphael Moll e375c940b9 Merge "SDK: Use "strip -x" for atree." 2012-06-07 12:26:08 -07:00
Ying Wang f1e424a636 am 3da13457: am 4b030617: Merge "XCode 4.3+ compatibility check-in"
* commit '3da13457cfa46cf7d46b57c00f387c7c310b2dba':
  XCode 4.3+ compatibility check-in
2012-06-07 12:02:06 -07:00
Ying Wang 3da13457cf am 4b030617: Merge "XCode 4.3+ compatibility check-in"
* commit '4b030617e74405779c657b98fa2b2e521adf4908':
  XCode 4.3+ compatibility check-in
2012-06-07 12:00:21 -07:00
Ying Wang 4b030617e7 Merge "XCode 4.3+ compatibility check-in" 2012-06-07 11:25:37 -07:00
Al Sutton 51f9bb02da XCode 4.3+ compatibility check-in
XCode 4.3 and later use a different location for SDKs. This check in
ensures the build checks for the new location as well as the old one.

Change-Id: I97884e5009f229f8b42e57a8feeb702b3a40a241
Signed-off-by: Al Sutton <al@funkyandroid.com>
2012-06-07 19:10:13 +01:00
The Android Open Source Project 9561c9cc76 Reconcile with jb-release nakasi-factoryrom-release
Change-Id: Ifb66dc982a827827f324018084f0c6f191cb3769
2012-06-07 07:48:48 -07:00
The Android Automerger adca40cfad JRN68 2012-06-07 07:09:17 -07:00
The Android Automerger 6c232a6026 merge in jb-release history after reset to jb-dev 2012-06-07 06:59:31 -07:00
Raphael Moll ec5fe91ead SDK: Use "strip -x" for atree.
Also fixes atree to accept an alternate command via the env var ATREE_STRIP
and correctly splits it for execvp if it contains arguments.

Change-Id: I8691bdc569bea3dddfde6249217dc305b6ef19f7
2012-06-06 23:39:47 -07:00
The Android Automerger 04e7264029 JRN67D 2012-06-06 16:50:19 -07:00
The Android Automerger 099f4ae979 JRN67C 2012-06-06 16:14:11 -07:00
Keun young Park d3da15a5ee am 6aae80a8: Merge "add mini.mk for common configurations for mini products" into jb-dev
* commit '6aae80a8d500084466c7e6d90769dda9a5b20507':
  add mini.mk for common configurations for mini products
2012-06-06 15:51:24 -07:00
Keun young Park 6aae80a8d5 Merge "add mini.mk for common configurations for mini products" into jb-dev 2012-06-06 15:47:24 -07:00
Keun young Park fd9f8bcfdb add mini.mk for common configurations for mini products
- it is used for generic pdk release

Bug: 6540216

Change-Id: I7dd21724a9484e48c66e4430cd003ffb448f075b
2012-06-06 14:15:57 -07:00
Ying Wang f521a8e888 am 6afbda9f: Merge "Clean common intermediate files if overlay changed" into jb-dev
* commit '6afbda9f07821deed6eb110247ab56fb47dfc775':
  Clean common intermediate files if overlay changed
2012-06-06 09:44:17 -07:00
Ying Wang 6afbda9f07 Merge "Clean common intermediate files if overlay changed" into jb-dev 2012-06-06 09:41:10 -07:00
The Android Automerger 84f4b69813 JRN67B 2012-06-06 09:13:38 -07:00
The Android Automerger 989d99ab28 JRN67 2012-06-06 07:08:29 -07:00
The Android Automerger 9d6ab50c01 merge in jb-release history after reset to jb-dev 2012-06-06 06:59:23 -07:00
The Android Automerger 0296c83486 JRN66C 2012-06-05 16:25:02 -07:00
Raghu Gandham f70dec9281 This patch addresses the following issues:
1. Fix a typo.
2. Include libffi in the MIPS list of Product Packages.
3. Default to JSC for MIPS until the MIPS support in v8 lands in aosp.
2012-06-05 15:33:37 -07:00
Ying Wang 9f4d00b94b am e534e2eb: am 47450542: Merge "Use Mac OS X SDK 10.6."
* commit 'e534e2eb2b5e79facf24c31eb2f60b8a0ee1f5b7':
  Use Mac OS X SDK 10.6.
2012-06-05 15:25:39 -07:00
Ying Wang e534e2eb2b am 47450542: Merge "Use Mac OS X SDK 10.6."
* commit '47450542a3d07eb79c80035c701638b1f07eb1c0':
  Use Mac OS X SDK 10.6.
2012-06-05 15:23:30 -07:00
Ying Wang 47450542a3 Merge "Use Mac OS X SDK 10.6." 2012-06-05 15:14:53 -07:00
Ying Wang 644dc164cc Use Mac OS X SDK 10.6.
Change-Id: I8ca16db2fb93d350829e14f4339e7ece75a2fb54
2012-06-05 14:23:22 -07:00