OSDN Git Service
Ying Wang [Thu, 6 Sep 2012 01:35:50 +0000 (18:35 -0700)]
am
478d0fc6: Merge "Remove duplicate src:dest pairs in PRODUCT_COPY_FILES"
* commit '
478d0fc6a311b236fddc9d18c9a1b922f8ecf1ea':
Remove duplicate src:dest pairs in PRODUCT_COPY_FILES
Ying Wang [Thu, 6 Sep 2012 01:15:11 +0000 (18:15 -0700)]
Merge "Remove duplicate src:dest pairs in PRODUCT_COPY_FILES"
Ying Wang [Thu, 6 Sep 2012 01:08:29 +0000 (18:08 -0700)]
Remove duplicate src:dest pairs in PRODUCT_COPY_FILES
Before setting up the rules.
Change-Id: Ifedbc0e988895a899cae315dc730a152bae91ae2
Conley Owens [Tue, 4 Sep 2012 17:29:43 +0000 (10:29 -0700)]
am
5da7ec4f: Merge "Follow symlinks in findleaves"
* commit '
5da7ec4fbdc8c2ac30f7dafb33327e9bfa337d5b':
Follow symlinks in findleaves
Conley Owens [Tue, 4 Sep 2012 17:24:54 +0000 (10:24 -0700)]
Merge "Follow symlinks in findleaves"
Jean-Baptiste Queru [Thu, 30 Aug 2012 18:40:13 +0000 (11:40 -0700)]
am
bb369a58: Merge "Add make_ext4fs to support installing apps to SD card"
* commit '
bb369a582b9756347959f6ef389507455f805df1':
Add make_ext4fs to support installing apps to SD card
Jean-Baptiste Queru [Thu, 30 Aug 2012 18:01:29 +0000 (11:01 -0700)]
Merge "Add make_ext4fs to support installing apps to SD card"
Jun Tian [Thu, 30 Aug 2012 02:59:17 +0000 (10:59 +0800)]
Add make_ext4fs to support installing apps to SD card
The default createSecureContainer format is changed from fat32 to ext4 in PackageHelper::CreateSdDir in:
/frameworks/base/core/java/com/android/internal/content/PackageHelper.java
We need to add make_ext4fs into the system image to support installing apps to SD card.
In kernel, we also need to add ext4 filesystem support.
Change-Id: If4817a95663144a6bfaeeed0c7cb081063a0daad
Signed-off-by: Jun Tian <jun.j.tian@intel.com>
Signed-off-by: Liang Chen <liang.l.chen@intel.com>
Signed-off-by: Panfeng Chang <panfengx.chang@intel.com>
Jean-Baptiste Queru [Tue, 28 Aug 2012 20:16:59 +0000 (13:16 -0700)]
am
9eb87b8d: Merge "Add pattern to check for GCC 4.6"
* commit '
9eb87b8d2011e65462ea42de6899158cd35a492a':
Add pattern to check for GCC 4.6
Jean-Baptiste Queru [Tue, 28 Aug 2012 20:16:58 +0000 (13:16 -0700)]
am
1d0f5f91: Merge "Include all standard shared library paths in /system/lib"
* commit '
1d0f5f914ae1406b976f69c265f0042c0279974e':
Include all standard shared library paths in /system/lib
Jean-Baptiste Queru [Tue, 28 Aug 2012 20:16:57 +0000 (13:16 -0700)]
am
9e2b4718: Merge "Use gold linker on x86"
* commit '
9e2b4718a0e11a723904ba205a5156bae450be30':
Use gold linker on x86
Jean-Baptiste Queru [Tue, 28 Aug 2012 19:47:34 +0000 (12:47 -0700)]
Merge "Add pattern to check for GCC 4.6"
Jean-Baptiste Queru [Tue, 28 Aug 2012 19:46:43 +0000 (12:46 -0700)]
Merge "Include all standard shared library paths in /system/lib"
Jean-Baptiste Queru [Tue, 28 Aug 2012 19:27:20 +0000 (12:27 -0700)]
Merge "Use gold linker on x86"
Pavel Chupin [Tue, 28 Aug 2012 08:20:55 +0000 (12:20 +0400)]
Use gold linker on x86
Patch removes fallback -fuse-ld=bfd for x86 target and
--copy-dt-needed-entries which is not supported by gold linker.
Change-Id: Ie5603f98e3f2f9d4f81678c718e39b130a75d057
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
Andrew Hsieh [Tue, 28 Aug 2012 02:49:05 +0000 (10:49 +0800)]
Add pattern to check for GCC 4.6
GCC 4.6 --version can return 4.6.x-google but also simply 4.6
as of https://android-review.googlesource.com/#/c/42028.
Add more pattern to detect it.
Change-Id: Ibf34fba9afdf01bd3eafc011cc4d059b59f25d3d
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
Chris Dearman [Thu, 2 Feb 2012 22:16:52 +0000 (14:16 -0800)]
Include all standard shared library paths in /system/lib
Signed-off-by: Chris Dearman <chris@mips.com>
Change-Id: Ib33ce42532cc8cedc6f48036a257a2a225c82a69
The Android Automerger [Mon, 27 Aug 2012 19:52:54 +0000 (12:52 -0700)]
JRO03U
Conley Owens [Fri, 24 Aug 2012 23:24:45 +0000 (16:24 -0700)]
Follow symlinks in findleaves
If we replace the project directories with symlinks to the actual
directories, everything should build fine. Unfortunately, without
this fix, it does not.
Change-Id: Id19fef9696d0f599a7b3a14b6a8fc10ae857f9c7
The Android Automerger [Fri, 24 Aug 2012 20:23:58 +0000 (13:23 -0700)]
JRO03T
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"
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
Jean-Baptiste Queru [Thu, 23 Aug 2012 21:52:40 +0000 (14:52 -0700)]
Merge "Fix reporting wrong error message for zipalign output file"
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:12:25 +0000 (16:12 -0700)]
Reconcile with jb-release - do not merge
Change-Id: I89dbc5ee1f1765f334f5dd5d1feb7c05a7d9360f
The Android Automerger [Tue, 21 Aug 2012 22:34:59 +0000 (15:34 -0700)]
JRO03S
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
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
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"
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
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
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
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 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: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: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 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: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
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
Jean-Baptiste Queru [Thu, 16 Aug 2012 21:55:25 +0000 (14:55 -0700)]
Merge "select.mk: Tune ccache options"
Andrew Boie [Mon, 13 Aug 2012 20:45:50 +0000 (13:45 -0700)]
select.mk: Tune ccache options
With these adjustments, cached object files can now be shared across
multiple Android trees on a single workstation:
* Compiler binary modification time no longer causes cache misses,
as a hash of the compiler binary is taken rather than looking
at the mtime and size
* Header file modification time no longer causes cache misses,
the headers are now always hashed
* Macros such as __DATE__ and __TIME__ no longer cause cache misses
* All paths in preprocessed source (due to use of -g) are now relative
These options require ccache 3.1 or later to be used; ccache 2.4 will
ignore these.
Change-Id: I7839637e9dacf7240bd9b7bfaa6406b1db423560
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
Elliott Hughes [Thu, 16 Aug 2012 03:02:49 +0000 (20:02 -0700)]
am
f2a618e1: Merge "The zoneinfo stuff is no longer legacy."
* commit '
f2a618e1df126c6c48622cce948825e923b52dcb':
The zoneinfo stuff is no longer legacy.
Elliott Hughes [Thu, 16 Aug 2012 02:43:40 +0000 (19:43 -0700)]
Merge "The zoneinfo stuff is no longer legacy."
Elliott Hughes [Thu, 16 Aug 2012 01:34:49 +0000 (18:34 -0700)]
The zoneinfo stuff is no longer legacy.
Change-Id: I7f76dfc15c0b2febbcdb13f12ff9390dca124585
Scott Main [Tue, 14 Aug 2012 23:31:07 +0000 (16:31 -0700)]
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
Change-Id: Icfb1b499abfca6a39b5bff8fab576b14a1cf960a
The Android Open Source Project [Wed, 15 Aug 2012 15:04:29 +0000 (08:04 -0700)]
Reconcile with jb-release - do not merge
Change-Id: I3ea7d0a8c3865290f404bb24b464fcfb7410dd0e
Scott Main [Wed, 15 Aug 2012 01:10:52 +0000 (18:10 -0700)]
am
9edfa6db: docs: move home.css into default.css to reduce number of requests
* commit '
9edfa6db8c53ef9515aaeed734bea02c5d65e1e5':
docs: move home.css into default.css to reduce number of requests
Scott Main [Tue, 14 Aug 2012 22:04:40 +0000 (15:04 -0700)]
docs: move home.css into default.css to reduce number of requests
Change-Id: I156182c5ad1545f570808af565948cbd3c05a3ee
Jean-Baptiste Queru [Tue, 14 Aug 2012 18:53:40 +0000 (11:53 -0700)]
am
4eddad55: Merge "Set the AOSP master to be API level 16"
* commit '
4eddad550ee81edba01734bf378612ed18841751':
Set the AOSP master to be API level 16
Jean-Baptiste Queru [Tue, 14 Aug 2012 17:51:21 +0000 (10:51 -0700)]
Merge "Set the AOSP master to be API level 16"
Jean-Baptiste Queru [Tue, 14 Aug 2012 16:07:33 +0000 (09:07 -0700)]
Set the AOSP master to be API level 16
Change-Id: I3ba4317aa1081ae5f60ac8504cfff8f4abee5e66
Ying Wang [Mon, 13 Aug 2012 23:24:11 +0000 (16:24 -0700)]
am
392bdc1f: Merge "Move the selinux modules to core PRODUCT_PACKAGES"
* commit '
392bdc1f08eb03ad04eba24a76cc0aea7e1b46d6':
Move the selinux modules to core PRODUCT_PACKAGES
The Android Automerger [Mon, 13 Aug 2012 23:07:45 +0000 (16:07 -0700)]
JRO03P
Ying Wang [Mon, 13 Aug 2012 22:41:12 +0000 (15:41 -0700)]
Merge "Move the selinux modules to core PRODUCT_PACKAGES"
Ying Wang [Mon, 13 Aug 2012 22:03:00 +0000 (15:03 -0700)]
Move the selinux modules to core PRODUCT_PACKAGES
The module names are phony targets and we should avoid having file targets
depend on phony targets.
Instead the build system makes sure to use the file dependency with
PRODUCT_PACKAGES.
Change-Id: I8dc59d8f9ed92c146b8827d71278e27214e60f3a
Ying Wang [Mon, 13 Aug 2012 22:17:45 +0000 (15:17 -0700)]
am
679b7498: Merge "Add mac_permissions.xml dependency."
* commit '
679b7498af86ee084791e86d06eaad87fe2f27f0':
Add mac_permissions.xml dependency.
Ying Wang [Mon, 13 Aug 2012 21:52:24 +0000 (14:52 -0700)]
Merge "Add mac_permissions.xml dependency."
Elliott Hughes [Sat, 11 Aug 2012 18:51:39 +0000 (11:51 -0700)]
am
20e713d1: Merge "Remove TARGET_linux-sh.mk."
* commit '
20e713d151dde66058453ec822b6bca8793008a4':
Remove TARGET_linux-sh.mk.
Elliott Hughes [Sat, 11 Aug 2012 16:34:51 +0000 (09:34 -0700)]
Merge "Remove TARGET_linux-sh.mk."
Elliott Hughes [Fri, 10 Aug 2012 22:36:51 +0000 (15:36 -0700)]
Remove TARGET_linux-sh.mk.
SH support is long gone from bionic and dalvik.
Change-Id: I613df5f0062d743686847610737af9a321eec1da
Jean-Baptiste Queru [Fri, 10 Aug 2012 16:23:42 +0000 (09:23 -0700)]
am
968f20a4: Merge "MIPS support to *.mk files and envsetup.sh"
* commit '
968f20a4c2ffca9a0cf8870bd96c77e65ca61243':
MIPS support to *.mk files and envsetup.sh
Jean-Baptiste Queru [Fri, 10 Aug 2012 16:23:39 +0000 (09:23 -0700)]
am
6e6d92c4: Merge "Support for MIPS Build targets."
* commit '
6e6d92c47acbb976ce47ae4d90406fa56ea68a3a':
Support for MIPS Build targets.
Jean-Baptiste Queru [Fri, 10 Aug 2012 16:23:38 +0000 (09:23 -0700)]
am
e443a9e9: Merge "Modify full_mips-eng build in line with the full-eng build"
* commit '
e443a9e92f323bff5bb304e1baf8b00ed18888be':
Modify full_mips-eng build in line with the full-eng build
Jean-Baptiste Queru [Fri, 10 Aug 2012 16:16:20 +0000 (09:16 -0700)]
Merge "MIPS support to *.mk files and envsetup.sh"
Raghu Gandham [Thu, 26 Jul 2012 02:57:22 +0000 (19:57 -0700)]
MIPS support to *.mk files and envsetup.sh
Change-Id: Iba4d046e3202524b29cfe32980927f8cc0aa8496
Signed-off-by: Chris Dearman <chris@mips.com>
Signed-off-by: Raghu Gandham <raghu@mips.com>
Jean-Baptiste Queru [Fri, 10 Aug 2012 15:39:33 +0000 (08:39 -0700)]
Merge "Support for MIPS Build targets."
Jean-Baptiste Queru [Fri, 10 Aug 2012 15:39:09 +0000 (08:39 -0700)]
Merge "Modify full_mips-eng build in line with the full-eng build"
The Android Open Source Project [Fri, 10 Aug 2012 15:33:53 +0000 (08:33 -0700)]
Reconcile with jb-mr0-release - do not merge
Change-Id: I21582e8cedf809f04f7d04d9af5a34c21ea77f41