OSDN Git Service
Ying Wang [Mon, 27 Aug 2012 23:01:38 +0000 (16:01 -0700)]
Keep the emma classes if emma is enabled.
Change-Id: Ie551d48532c61bf610b12875dc33cfe476625c5e
Ying Wang [Mon, 27 Aug 2012 22:25:11 +0000 (15:25 -0700)]
Merge "Automatically add Java resources carried by static Java libraries." into jb-mr1-dev
Ying Wang [Thu, 9 Aug 2012 22:20:50 +0000 (15:20 -0700)]
Automatically add Java resources carried by static Java libraries.
Bug:
6892294
Change-Id: I3ff71ee3d7b9ccdfde6a5284cc350864fbffa71f
Conflicts:
core/package.mk
The Android Open Source Project [Mon, 27 Aug 2012 22:13:12 +0000 (15:13 -0700)]
am
28f37bb9: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge
* commit '
28f37bb992853a877980ea0d1040df2e46ee71c1':
JRO03U
JRO03T
JZO54
The Android Open Source Project [Mon, 27 Aug 2012 21:10:49 +0000 (14:10 -0700)]
Reconcile with jb-mr0-release jb-release - do not merge
Change-Id: Ibe50742a45ef532acf13f4edb8166b6e6c1ef30c
The Android Automerger [Mon, 27 Aug 2012 19:52:54 +0000 (12:52 -0700)]
JRO03U
Ben Cheng [Mon, 27 Aug 2012 19:27:37 +0000 (12:27 -0700)]
Merge "Define the proper macro "GTEST_OS_LINUX_ANDROID" for native tests." into jb-mr1-dev
Ben Cheng [Mon, 27 Aug 2012 19:20:36 +0000 (12:20 -0700)]
Define the proper macro "GTEST_OS_LINUX_ANDROID" for native tests.
Bug
7050760
Change-Id: I05e69b741eaf628ab1d25dec12a953f9f2a3d9a2
The Android Automerger [Fri, 24 Aug 2012 20:23:58 +0000 (13:23 -0700)]
JRO03T
Jean-Baptiste Queru [Fri, 24 Aug 2012 20:06:42 +0000 (13:06 -0700)]
am
dbf6ad06: am
713bac96: Merge "ARM: put crtbegin_so.o at the beginning where it belongs"
* commit '
dbf6ad0692f98cacf27dc023854b2c5a5575a841':
ARM: put crtbegin_so.o at the beginning where it belongs
Jean-Baptiste Queru [Fri, 24 Aug 2012 20:04:48 +0000 (13:04 -0700)]
am
713bac96: Merge "ARM: put crtbegin_so.o at the beginning where it belongs"
* commit '
713bac96d628d6ca040fb1fe5d7a8abdcb932553':
ARM: put crtbegin_so.o at the beginning where it belongs
Jean-Baptiste Queru [Fri, 24 Aug 2012 20:00:10 +0000 (13:00 -0700)]
Merge "ARM: put crtbegin_so.o at the beginning where it belongs"
Ying Wang [Fri, 24 Aug 2012 16:52:19 +0000 (09:52 -0700)]
Merge "Filter out the overridden packages before doing required module expansion." into jb-mr1-dev
Jean-Baptiste Queru [Fri, 24 Aug 2012 14:30:00 +0000 (07:30 -0700)]
am
83af736f: am
5ac65f86: Merge "Fix reporting wrong error message for zipalign output file"
* commit '
83af736f28c03bcac552f83bc645433925135c7e':
Fix reporting wrong error message for zipalign output file
The Android Automerger [Fri, 24 Aug 2012 04:31:01 +0000 (21:31 -0700)]
JZO54
The Android Automerger [Fri, 24 Aug 2012 04:30:08 +0000 (21:30 -0700)]
merge in jb-mr0-release history after reset to jb-dev
Jean-Baptiste Queru [Thu, 23 Aug 2012 22:09:15 +0000 (15:09 -0700)]
am
5ac65f86: Merge "Fix reporting wrong error message for zipalign output file"
* commit '
5ac65f869601df5e73fb84b67e57af8ef95cc3bf':
Fix reporting wrong error message for zipalign output file
Ying Wang [Thu, 23 Aug 2012 22:08:34 +0000 (15:08 -0700)]
Filter out the overridden packages before doing required module expansion.
Bug:
6900954
Change-Id: Ib0f57dc4bfc341ec7166429a5bb71bfc5e28d271
Jean-Baptiste Queru [Thu, 23 Aug 2012 21:52:40 +0000 (14:52 -0700)]
Merge "Fix reporting wrong error message for zipalign output file"
Victoria Lease [Thu, 23 Aug 2012 18:58:01 +0000 (11:58 -0700)]
Merge "getsdcardpath, getscreenshotpath, getlastscreenshot" into jb-mr1-dev
Ying Wang [Thu, 23 Aug 2012 01:27:08 +0000 (18:27 -0700)]
Merge "Allow target arch in tapas parameters." into jb-mr1-dev
Ying Wang [Wed, 22 Aug 2012 22:19:28 +0000 (15:19 -0700)]
Merge "Support EMMA_INSTRUMENT in both full and unbundled builds." into jb-mr1-dev
Paul Westbrook [Wed, 22 Aug 2012 21:49:58 +0000 (14:49 -0700)]
Remove imap2 from build
Change-Id: I64b5db47895e99f76d30e453f4d95c9546a96839
Ying Wang [Tue, 21 Aug 2012 23:59:01 +0000 (16:59 -0700)]
Support EMMA_INSTRUMENT in both full and unbundled builds.
Bug:
6987838
- With this change, use "EMMA_INSTRUMENT=true" to enable emma in full or
unbundled build.
- You don't need to add "LOCAL_STATIC_JAVA_LIBRARIES += emma" any more for
unbundled apps.
- Now a single var LOCAL_EMMA_INSTRUMENT replaces the previous
LOCAL_NO_EMMA_INSTRUMENT and LOCAL_NO_EMMA_COMPILE.
- By default, if EMMA_INSTRUMENT is true, emma is enabled for only
non-test apps.
- A new global var EMMA_INSTRUMENT_STATIC. It enables EMMA_INSTRUMENT
and builds emma into apk/jar as static library, instead of using emma
as part of shared library core.jar.
Change-Id: I0aa219e83074879ececc159b5b07c39eb07ccc00
Ying Wang [Wed, 22 Aug 2012 17:25:20 +0000 (10:25 -0700)]
Allow target arch in tapas parameters.
For example:
$ tapas App1 App2 x86 userdebug
Change-Id: I19601a93484f70dac677d2d68033684db32e1321
Ying Wang [Wed, 22 Aug 2012 17:10:09 +0000 (10:10 -0700)]
Merge "Allow full_x86 and full_mips in unbundled build." into jb-mr1-dev
Ying Wang [Fri, 10 Aug 2012 22:12:15 +0000 (15:12 -0700)]
Allow full_x86 and full_mips in unbundled build.
So we can do unbundled builds for x86 and mips devices.
Change-Id: Ibd8c3b0371c316b713a748a6e6ce14fe98fdc4aa
Jean-Baptiste Queru [Wed, 22 Aug 2012 16:57:30 +0000 (09:57 -0700)]
am
e3479ea5: am
15012c11: Merge "Build on Mac OS X : add experimental SDK versions"
* commit '
e3479ea5033e2ede36f6f771dd3a6ea315505efd':
Build on Mac OS X : add experimental SDK versions
Jean-Baptiste Queru [Wed, 22 Aug 2012 16:55:25 +0000 (09:55 -0700)]
am
15012c11: Merge "Build on Mac OS X : add experimental SDK versions"
* commit '
15012c115dca7bc0d2edd8dd2689117546b1360e':
Build on Mac OS X : add experimental SDK versions
Jean-Baptiste Queru [Wed, 22 Aug 2012 16:44:48 +0000 (09:44 -0700)]
Merge "Build on Mac OS X : add experimental SDK versions"
The Android Open Source Project [Tue, 21 Aug 2012 23:13:22 +0000 (16:13 -0700)]
am
9c6df3cd: (-s ours) Reconcile with jb-release - do not merge
* commit '
9c6df3cdcc938302ba3176f56ec9b19c2d226227':
JRO03S
The Android Open Source Project [Tue, 21 Aug 2012 23:12:25 +0000 (16:12 -0700)]
Reconcile with jb-release - do not merge
Change-Id: I89dbc5ee1f1765f334f5dd5d1feb7c05a7d9360f
Victoria Lease [Tue, 21 Aug 2012 22:44:06 +0000 (15:44 -0700)]
getsdcardpath, getscreenshotpath, getlastscreenshot
Added a few new functions to envsetup.sh:
- getsdcardpath() returns the sdcard path. This will be more useful
when multiuser storage complicates the sdcard path.
- getscreenshotpath() returns the path to screenshots
- getlastscreenshot() adb pulls the most recently-taken screenshot
Change-Id: I851145088344dff6f1672f0a423201f3aa3e4390
The Android Automerger [Tue, 21 Aug 2012 22:34:59 +0000 (15:34 -0700)]
JRO03S
Ying Wang [Tue, 21 Aug 2012 20:45:37 +0000 (13:45 -0700)]
Merge "android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES." into jb-mr1-dev
Andrew Hsieh [Tue, 21 Aug 2012 20:01:05 +0000 (13:01 -0700)]
am
cd3050c5: am
4d69e06b: Merge "Added BUILD_HOST_static to build statically linked executable/shared-lib"
* commit '
cd3050c541f665ee4b8462d1ccdabfe1ed2dbf4a':
Added BUILD_HOST_static to build statically linked executable/shared-lib
Andrew Hsieh [Tue, 21 Aug 2012 19:58:45 +0000 (12:58 -0700)]
am
4d69e06b: Merge "Added BUILD_HOST_static to build statically linked executable/shared-lib"
* commit '
4d69e06b764d030dcc3ce9bc8b103a75eff3175a':
Added BUILD_HOST_static to build statically linked executable/shared-lib
Ying Wang [Tue, 21 Aug 2012 18:54:49 +0000 (11:54 -0700)]
android.core.vm-tests-tf.jar path changed to HOST JAVA_LIBRARIES.
Bug:
7019588
Change-Id: I6406110071d891e27df6d1cc562a7baa884b2e9e
Keun young Park [Tue, 21 Aug 2012 18:22:46 +0000 (11:22 -0700)]
Merge "change target to androideabi" into jb-mr1-dev
SangWook Han [Mon, 30 Jul 2012 17:09:38 +0000 (02:09 +0900)]
Build on Mac OS X : add experimental SDK versions
Change-Id: Ifc67d1745e72fc048cd6e8c8ef0521ab92468086
Doug Zongker [Tue, 21 Aug 2012 17:33:44 +0000 (10:33 -0700)]
change recovery partition construction to use resource .dat
When /system/etc/recovery-resource.dat is available, use it to
construct the recovery-from-boot patch.
Change-Id: I1575f7d284711323186ca6823842eb2a866fd890
Andrew Hsieh [Tue, 21 Aug 2012 17:21:54 +0000 (10:21 -0700)]
Merge "Added BUILD_HOST_static to build statically linked executable/shared-lib"
Keun young Park [Tue, 21 Aug 2012 17:20:18 +0000 (10:20 -0700)]
change target to androideabi
- it should be androideabi instead of android
external/llvm/lib/Support/Triple.cpp
Change-Id: Ied50f2dba930b402d000b5eb3b3ce5ef20731b8b
Ard Biesheuvel [Tue, 21 Aug 2012 08:42:32 +0000 (10:42 +0200)]
ARM: put crtbegin_so.o at the beginning where it belongs
Change-Id: I9466fe9277c58a7b8f8a9964b2d578a65e579995
Andrew Hsieh [Tue, 21 Aug 2012 06:40:16 +0000 (14:40 +0800)]
Added BUILD_HOST_static to build statically linked executable/shared-lib
Statically linked executable/shared-lib (eg. SDK tools) are useful
in sandboxed environment.
In BUILD_HOST_static zipalign needs -lpthread indirectly:
zipalign->libutils.a->liblog.a->logd_write.c->pthread
Change-Id: I615f574e918c83ed1ab82db2453b69d0420cb59c
Keun young Park [Tue, 21 Aug 2012 00:25:52 +0000 (17:25 -0700)]
Merge "replace apps for PDK" into jb-mr1-dev
Keun young Park [Mon, 20 Aug 2012 20:17:53 +0000 (13:17 -0700)]
replace apps for PDK
- Launcher2 to Home
- SystemUI to DummySystemUI
- Settings to DummySettings
Change-Id: Ibeecf3d4df0dbb38737dba7503819d2b700036c1
Scott Main [Tue, 21 Aug 2012 00:02:56 +0000 (17:02 -0700)]
am
50187e53: am
f5089846: docs: combine all possible js files into one to reduce the number of requests Also make change to doc template and css to fix footer layout bug introduced by change
9edfa6db8c53ef9515aaeed734bea02c5d65e1e5
* commit '
50187e53450fba54131e5d5857e5f05cb6b0e849':
docs: combine all possible js files into one to reduce the number of requests Also make change to doc template and css to fix footer layout bug introduced by change
9edfa6db8c53ef9515aaeed734bea02c5d65e1e5
Scott Main [Tue, 21 Aug 2012 00:01:19 +0000 (17:01 -0700)]
am
f5089846: docs: combine all possible js files into one to reduce the number of requests Also make change to doc template and css to fix footer layout bug introduced by change
9edfa6db8c53ef9515aaeed734bea02c5d65e1e5
* commit '
f5089846a1876f8e976d4bd1ddf383d3ed68d558':
docs: combine all possible js files into one to reduce the number of requests Also make change to doc template and css to fix footer layout bug introduced by change
9edfa6db8c53ef9515aaeed734bea02c5d65e1e5
Doug Zongker [Mon, 20 Aug 2012 22:47:06 +0000 (15:47 -0700)]
Merge "include recovery-resource.dat in /system/etc" into jb-mr1-dev
Doug Zongker [Mon, 20 Aug 2012 22:38:58 +0000 (15:38 -0700)]
include recovery-resource.dat in /system/etc
Put the recovery UI images into a file in /system/etc where we can use
them for constructing the recovery image, so they don't need to be
included in OTA packages.
Change-Id: Iab2144865298c8967eb31660abd3bb11e6ec26fa
Keun young Park [Mon, 20 Aug 2012 16:36:11 +0000 (09:36 -0700)]
Merge "add CLANG configurations for MIPS" into jb-mr1-dev
Jingwen Owen Ou [Fri, 17 Aug 2012 23:21:11 +0000 (16:21 -0700)]
Fix reporting wrong error message for zipalign output file
The problem is due to using variable inFileName instead of outFileName for printing out error message for output file.
Change-Id: Ie53a21b077fea5e7cd106fe6884cea159d2629a2
Ying Wang [Fri, 17 Aug 2012 22:04:38 +0000 (15:04 -0700)]
Merge "Skip the top out directory in mgrep." into jb-mr1-dev
Ying Wang [Fri, 17 Aug 2012 22:03:20 +0000 (15:03 -0700)]
Skip the top out directory in mgrep.
Change-Id: I0530b24179034f521dc2366588cdc906ef466750
Doug Zongker [Fri, 17 Aug 2012 20:15:28 +0000 (13:15 -0700)]
Merge "load SYSTEM/build.prop into the info_dict" into jb-mr1-dev
Joe Onorato [Fri, 17 Aug 2012 12:46:29 +0000 (05:46 -0700)]
am
726d921a: am
45cd00cd: Merge "Install all host modules. Don\'t filter out ones tagged "optional""
* commit '
726d921a47cb1003bcf7ff84ae1d332dec86d674':
Install all host modules. Don't filter out ones tagged "optional"
Joe Onorato [Fri, 17 Aug 2012 12:43:43 +0000 (05:43 -0700)]
am
45cd00cd: Merge "Install all host modules. Don\'t filter out ones tagged "optional""
* commit '
45cd00cd9e2feec187a6253b95e866cd10dfa20a':
Install all host modules. Don't filter out ones tagged "optional"
Joe Onorato [Fri, 17 Aug 2012 12:36:20 +0000 (05:36 -0700)]
Merge "Install all host modules. Don't filter out ones tagged "optional""
Joe Onorato [Fri, 17 Aug 2012 12:33:39 +0000 (05:33 -0700)]
Install all host modules. Don't filter out ones tagged "optional"
Change-Id: I9b3a27a4c84ee748314e98603670eb939ae949e2
Joe Onorato [Fri, 17 Aug 2012 12:08:36 +0000 (05:08 -0700)]
am
763c0801: am
687bde38: Merge "Add all the host tools to the list of prerequisites for the SDK."
* commit '
763c080198655782cc5700d6f53cce330ab7e008':
Add all the host tools to the list of prerequisites for the SDK.
Joe Onorato [Fri, 17 Aug 2012 11:34:06 +0000 (04:34 -0700)]
am
687bde38: Merge "Add all the host tools to the list of prerequisites for the SDK."
* commit '
687bde38891b6aa3796f52721d7498436ab45330':
Add all the host tools to the list of prerequisites for the SDK.
Joe Onorato [Fri, 17 Aug 2012 11:20:37 +0000 (04:20 -0700)]
Merge "Add all the host tools to the list of prerequisites for the SDK."
Joe Onorato [Fri, 17 Aug 2012 11:19:38 +0000 (04:19 -0700)]
Add all the host tools to the list of prerequisites for the SDK.
Change-Id: I3a3e4be8796f761119e29f3be64ad534e48c95ee
Joe Onorato [Fri, 17 Aug 2012 08:26:41 +0000 (01:26 -0700)]
resolved conflicts for merge of
fab83a3d to jb-mr1-dev
Change-Id: I97aff2be317fd10b68d933e65259ec48bd5ff6a1
Joe Onorato [Fri, 17 Aug 2012 08:22:31 +0000 (01:22 -0700)]
am
3b4b11a4: Merge "Another error to warning"
* commit '
3b4b11a4701b64df5248e7d86c0c357954a2ca10':
Another error to warning
Joe Onorato [Fri, 17 Aug 2012 08:13:00 +0000 (01:13 -0700)]
Merge "Another error to warning"
Joe Onorato [Fri, 17 Aug 2012 08:12:27 +0000 (01:12 -0700)]
Another error to warning
Change-Id: Ifbad63e3eb37d087d88a39e102b4239f305d0ee3
Joe Onorato [Fri, 17 Aug 2012 07:47:42 +0000 (00:47 -0700)]
am
6b340ad0: am
7c945d24: Merge "Make error a warning for now"
* commit '
6b340ad06c90ad80894bce720075e05f31b8f4cb':
Make error a warning for now
Joe Onorato [Fri, 17 Aug 2012 07:46:36 +0000 (00:46 -0700)]
am
7c945d24: Merge "Make error a warning for now"
* commit '
7c945d249956ed3943585b8d417a51a598b175b3':
Make error a warning for now
Joe Onorato [Fri, 17 Aug 2012 07:36:44 +0000 (00:36 -0700)]
Merge "Make error a warning for now"
Joe Onorato [Fri, 17 Aug 2012 07:35:09 +0000 (00:35 -0700)]
Make error a warning for now
Change-Id: Idf18957fff2bb4ff31ca6d7d8d1c8d95847b4e00
Joe Onorato [Fri, 17 Aug 2012 07:09:27 +0000 (00:09 -0700)]
resolved conflicts for merge of
5836d3b3 to jb-mr1-dev
Change-Id: If3d84a7439717ccf7723b3f79e934d73abbb3fea
Joe Onorato [Fri, 17 Aug 2012 06:50:34 +0000 (23:50 -0700)]
am
f72e34eb: Merge changes I9d3a3c16,I17b5d441,I29e27505,Ia5ca233e,I0a0b200b,I6f412ed4,I623821df,Ifec8e63e,I12d0a847,Idac551e5,I59a88027,I2498139d,I6bd93a87
* commit '
f72e34ebf49ed2a06fe9e37d134f2088e2c0c0e4':
Move the old user tagged modules over to base.mk so mini and core both share them.
More product debugging.
build system changes for jb-aah-dev merge
Fail when a non-vendor product references a vendor module.
Remove support for user tags in the build system.
List the user modules explicitly, and we can get rid of the support for the user tag!
Dump the user tagged modules.
host modules don't need LOCAL_MODULE_TAGS
Don't give the user tag to host modules automatically.
Add a phony "nothing" goal that reads the makefiles but doesn't try to build anything.
Add tool to parse make dependency info from new --deps flag.
Use a more modern -j flag.
make product-graph now filtered
Joe Onorato [Fri, 17 Aug 2012 06:37:45 +0000 (23:37 -0700)]
Merge changes I9d3a3c16,I17b5d441,I29e27505,Ia5ca233e,I0a0b200b,I6f412ed4,I623821df,Ifec8e63e,I12d0a847,Idac551e5,I59a88027,I2498139d,I6bd93a87
* changes:
Move the old user tagged modules over to base.mk so mini and core both share them.
More product debugging.
build system changes for jb-aah-dev merge
Fail when a non-vendor product references a vendor module.
Remove support for user tags in the build system.
List the user modules explicitly, and we can get rid of the support for the user tag!
Dump the user tagged modules.
host modules don't need LOCAL_MODULE_TAGS
Don't give the user tag to host modules automatically.
Add a phony "nothing" goal that reads the makefiles but doesn't try to build anything.
Add tool to parse make dependency info from new --deps flag.
Use a more modern -j flag.
make product-graph now filtered
Joe Onorato [Tue, 24 Jul 2012 01:20:07 +0000 (18:20 -0700)]
Move the old user tagged modules over to base.mk so mini and core both share them.
Change-Id: I9d3a3c165fa56d4ca137b3c06e249e1deea6a1c5
Joe Onorato [Mon, 23 Jul 2012 20:51:44 +0000 (13:51 -0700)]
More product debugging.
Change-Id: I17b5d441e44ea39564263b32f963e2d3ac684232
Joe Onorato [Thu, 12 Jul 2012 02:38:48 +0000 (19:38 -0700)]
build system changes for jb-aah-dev merge
Change-Id: I29e27505a0d9f7cc2932f725bfe1c83d804388bc
Joe Onorato [Wed, 23 May 2012 00:33:22 +0000 (17:33 -0700)]
Fail when a non-vendor product references a vendor module.
Change-Id: Ia5ca233e9b11f64b72074f65899d3041cf955c4c
Joe Onorato [Tue, 22 May 2012 21:08:50 +0000 (14:08 -0700)]
Remove support for user tags in the build system.
It is not forbidden to say LOCAL_MODULE_TAGS := user,
and if you don't say LOCAL_MODULE_TAGS, it now defaults
to optional.
Change-Id: I0a0b200bb6f1c7bf1fe3a89cdc8f69678617526c
Joe Onorato [Tue, 22 May 2012 19:20:27 +0000 (12:20 -0700)]
List the user modules explicitly, and we can get rid of the support for the user tag!
Change-Id: I6f412ed4e08d784ed71ec170e870fcf30081963a
Joe Onorato [Mon, 21 May 2012 19:16:05 +0000 (12:16 -0700)]
Dump the user tagged modules.
Change-Id: I623821df3e48b358a6b898ccb13750f7dc54ddcf
Joe Onorato [Sat, 19 May 2012 03:43:41 +0000 (20:43 -0700)]
host modules don't need LOCAL_MODULE_TAGS
Change-Id: Ifec8e63eef512b281eb924ef92160e9e1bf97f6d
Joe Onorato [Sat, 19 May 2012 03:43:14 +0000 (20:43 -0700)]
Don't give the user tag to host modules automatically.
Change-Id: I12d0a84786e5bf2224efd8684526b6097e6105d7
Joe Onorato [Sat, 19 May 2012 03:41:38 +0000 (20:41 -0700)]
Add a phony "nothing" goal that reads the makefiles but doesn't try to build anything.
Change-Id: Idac551e5c796321e993b94761f5cbf5b55c1a994
Joe Onorato [Sat, 19 May 2012 03:39:51 +0000 (20:39 -0700)]
Add tool to parse make dependency info from new --deps flag.
Change-Id: I59a88027d88cceee9f2933c84379612698952043
Joe Onorato [Tue, 8 May 2012 02:21:51 +0000 (19:21 -0700)]
Use a more modern -j flag.
Change-Id: I2498139dd41637a795ca43f830c952adb2856d83
Joe Onorato [Tue, 8 May 2012 00:15:15 +0000 (17:15 -0700)]
make product-graph now filtered
Change-Id: I6bd93a87902e20a24c1c58152fb578ef1f4cb208
The Android Open Source Project [Fri, 17 Aug 2012 01:57:26 +0000 (18:57 -0700)]
am
dfab95a1: (-s ours) Reconcile with jb-mr0-release jb-release - do not merge
* commit '
dfab95a150da3014794fc92006c7f44e635ce1f6':
JRO03R
JZO47
JRO03Q
The Android Open Source Project [Fri, 17 Aug 2012 01:55:59 +0000 (18:55 -0700)]
Reconcile with jb-mr0-release jb-release - do not merge
Change-Id: Ie56fbb34384a4cf7d00b2ce89fd69ec434396a05
The Android Automerger [Fri, 17 Aug 2012 01:22:16 +0000 (18:22 -0700)]
JRO03R
The Android Automerger [Fri, 17 Aug 2012 00:58:34 +0000 (17:58 -0700)]
JZO47
The Android Automerger [Fri, 17 Aug 2012 00:57:18 +0000 (17:57 -0700)]
merge in jb-mr0-release history after reset to jb-dev
Ying Wang [Thu, 16 Aug 2012 23:51:00 +0000 (16:51 -0700)]
Merge "Don't include system/core/include/arch/<arch>/Android.mk for apps-only build." into jb-mr1-dev
Ying Wang [Thu, 16 Aug 2012 23:45:01 +0000 (16:45 -0700)]
Don't include system/core/include/arch/<arch>/Android.mk for apps-only build.
Bug:
6994483
Change-Id: I76c4d96264cf94a79d59fdeb52bb37c07a9458dd
Keun young Park [Thu, 16 Aug 2012 00:53:29 +0000 (17:53 -0700)]
add CLANG configurations for MIPS
Change-Id: I36ed8089c447c20c229c348a096b49ff126552de
Doug Zongker [Thu, 16 Aug 2012 23:19:00 +0000 (16:19 -0700)]
load SYSTEM/build.prop into the info_dict
Change-Id: Ic747106ba11773ffc9c2eebc163cfd22b1d7a4d5
Jean-Baptiste Queru [Thu, 16 Aug 2012 22:28:47 +0000 (15:28 -0700)]
am
d77d8906: am
6020d698: Merge "select.mk: Tune ccache options"
* commit '
d77d8906b8fc4a6e2ecaf9bc5f5b84ddec6dbe7e':
select.mk: Tune ccache options
Jean-Baptiste Queru [Thu, 16 Aug 2012 22:27:54 +0000 (15:27 -0700)]
am
6020d698: Merge "select.mk: Tune ccache options"
* commit '
6020d698f51132cab374e6c96f7da4902f3aa84f':
select.mk: Tune ccache options
The Android Automerger [Thu, 16 Aug 2012 22:21:25 +0000 (15:21 -0700)]
JRO03Q