Commit Graph

9293 Commits

Author SHA1 Message Date
Ying Wang 43ca4a45a4 Remove the user tag and legacy prebuilts for the srec modules.
Change-Id: I20d8ec8986e2da76fbab67d1f86f5d385bd87c47
2012-06-15 18:36:06 -07:00
The Android Automerger 175026a969 JRN75E 2012-06-15 16:17:07 -07:00
The Android Automerger fe79d01cad JRN75D 2012-06-15 14:13:01 -07:00
Kito Cheng 70dc3e1d3d Profiling use aprof, enable by LOCAL_ENABLE_APROF or LOCAL_ENABLE_APROF_JNI
Change-Id: Ia95dc7318e17c0804867b22e239edccc5cbec0af
2012-06-15 15:16:50 +08:00
The Android Automerger ccfa22ebad JRN75C 2012-06-14 16:48:04 -07:00
The Android Automerger 43843b6f58 JRN75B 2012-06-14 13:29:21 -07:00
Jean-Baptiste Queru ffbef646d2 am 74aba614: Allow additional vendors
* commit '74aba61404f0c1ea8693d2959d81d8b5b1bdf5d4':
  Allow additional vendors
2012-06-14 09:24:18 -07:00
Jean-Baptiste Queru 74aba61404 Allow additional vendors
Bug: 6611375
Change-Id: I07a1c4e56a2c9fdb1f2c8426977f1a8db0e4d4bb
2012-06-14 09:15:20 -07:00
The Android Automerger 91f3d748c4 JRN75 2012-06-14 07:09:54 -07:00
The Android Automerger 11b1194cf6 merge in jb-release history after reset to jb-dev 2012-06-14 06:59:24 -07:00
The Android Automerger 291b58d00d JRN74C 2012-06-13 18:43:04 -07:00
Jean-Baptiste Queru 55e8c113af am 3e4732a3: am 08779651: Merge "generic_x86: build using the NDK ABI\'s processor features"
* commit '3e4732a39f63326d267a1af17184556e3977f582':
  generic_x86: build using the NDK ABI's processor features
2012-06-13 17:34:28 -07:00
Jean-Baptiste Queru 3e4732a39f am 08779651: Merge "generic_x86: build using the NDK ABI\'s processor features"
* commit '0877965170498b2dd3a58f9483cf26d6945c9138':
  generic_x86: build using the NDK ABI's processor features
2012-06-13 17:31:45 -07:00
Jean-Baptiste Queru 0877965170 Merge "generic_x86: build using the NDK ABI's processor features" 2012-06-13 17:17:34 -07:00
The Android Automerger 0445111a01 JRN74B 2012-06-13 16:40:23 -07:00
The Android Automerger d3acbf293f JRN74 2012-06-13 09:03:15 -07:00
The Android Automerger e0db94ba82 merge in jb-release history after reset to jb-dev 2012-06-13 08:26:26 -07:00
Jean-Baptiste Queru 6e207824af resolved conflicts for merge of 572d0d7d to jb-dev-plus-aosp
Change-Id: I6c750adcf06457bf8a3b47423c990be6e9d23bbb
2012-06-13 07:42:04 -07:00
Jean-Baptiste Queru 572d0d7dd3 am 3f8ff030: Merge "x86: Clean up atom vs/ non-atom compiler flags, enable SSSE3"
* commit '3f8ff030e0c693ca0b1758612ecb571711ec2667':
  x86: Clean up atom vs/ non-atom compiler flags, enable SSSE3
2012-06-13 07:22:29 -07:00
Jean-Baptiste Queru 3f8ff030e0 Merge "x86: Clean up atom vs/ non-atom compiler flags, enable SSSE3" 2012-06-13 06:25:00 -07:00
Jean-Baptiste Queru 06b1a47fe1 am d3d78a30: am a11ad6c2: Merge "gcc 4.6 requires --copy-dt-needed-entries"
* commit 'd3d78a30a4f8dd40fa055577ea2708ab34606cec':
  gcc 4.6 requires --copy-dt-needed-entries
2012-06-12 15:52:54 -07:00
Jean-Baptiste Queru d3d78a30a4 am a11ad6c2: Merge "gcc 4.6 requires --copy-dt-needed-entries"
* commit 'a11ad6c2b3cdf13581c4329679cd3d2952323f6d':
  gcc 4.6 requires --copy-dt-needed-entries
2012-06-12 15:50:19 -07:00
Jean-Baptiste Queru a11ad6c2b3 Merge "gcc 4.6 requires --copy-dt-needed-entries" 2012-06-12 15:24:17 -07:00
Jean-Baptiste Queru 12d24b5aab resolved conflicts for merge of 76af0657 to jb-dev-plus-aosp
Change-Id: I4843695261abbc478fd6b505debe6fc20a06c88d
2012-06-12 14:57:27 -07:00
Jean-Baptiste Queru 76af0657be am 0c6b27fe: Merge "full_x86: use telephony profile"
* commit '0c6b27fe83a810c5a91c3aa1a4ffc0348d24b5cd':
  full_x86: use telephony profile
2012-06-12 14:43:56 -07:00
Jean-Baptiste Queru 0c6b27fe83 Merge "full_x86: use telephony profile" 2012-06-12 14:36:04 -07:00
Bruce Beare 46b48e88fe full_x86: use telephony profile
Author: Bruce Beare <bruce.j.beare@intel.com>
Change-Id: I3c086f3f38049e9a7cc2e653aa0ee0d2a2ca1a79
2012-06-12 14:34:53 -07:00
Jamie Gennis 82c11caca0 am f3b1395a: Merge "Add atrace to core.mk" into jb-dev
* commit 'f3b1395a41a1f882fac74b8a55723af8f77535d0':
  Add atrace to core.mk
2012-06-12 12:41:26 -07:00
The Android Automerger 11ee14dd10 JRN73 2012-06-12 11:30:36 -07:00
The Android Automerger 7acc0ed4a6 merge in jb-release history after reset to jb-dev 2012-06-12 11:19:13 -07:00
The Android Automerger 9657c6160d JRN72D 2012-06-12 08:22:39 -07:00
Jean-Baptiste Queru ddb706785b am 5b7633be: am 06e515dd: Merge "This patch addresses the following issues:"
* commit '5b7633be4e107888db7b6fc3d50be6aa8eb7f95c':
  This patch addresses the following issues:
2012-06-12 08:05:22 -07:00
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