OSDN Git Service
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
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
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>
Ying Wang [Wed, 15 Aug 2012 19:22:44 +0000 (12:22 -0700)]
Support to build emmap_mata.zip in unbundled builds.
Bug:
6987838
Change-Id: Id6c81b08c4859442b7d52054ed5f278575719d1a
Elliott Hughes [Thu, 16 Aug 2012 03:03:54 +0000 (20:03 -0700)]
am
0fc8d635: am
f2a618e1: Merge "The zoneinfo stuff is no longer legacy."
* commit '
0fc8d635a7f3712cc24f7a29d97755bc15972a0a':
The zoneinfo stuff is no longer legacy.
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
Keun young Park [Wed, 15 Aug 2012 20:42:37 +0000 (13:42 -0700)]
fix MIPS build
- crtxx.o built under TARGET_OUT_INTERMEDIATE_LIBRARIES,
not under TARGET_OUT_STATIC_LIBRARIES
Change-Id: Ife05206bd66f691853100bbf17e08a13c287d073
Keun young Park [Wed, 15 Aug 2012 18:32:23 +0000 (11:32 -0700)]
fix PDK boot issue
- add missing packages to make it boot
Change-Id: I9a4a635e67a82c326f9eb1eceb86cffc8f59a2d3
Iliyan Malchev [Wed, 15 Aug 2012 16:18:11 +0000 (09:18 -0700)]
Merge "build: register BOARD_HAVE_BLUETOOTH_QCOM" into jb-mr1-dev
Iliyan Malchev [Wed, 15 Aug 2012 15:12:01 +0000 (08:12 -0700)]
build: register BOARD_HAVE_BLUETOOTH_QCOM
Change-Id: I594abd6d3b152a4e5bc48b6ac447e155c85b2fe0
Signed-off-by: Iliyan Malchev <malchev@google.com>
The Android Open Source Project [Wed, 15 Aug 2012 15:05:37 +0000 (08:05 -0700)]
am
1a0f6725: (-s ours) Reconcile with jb-release - do not merge
* commit '
1a0f6725392279ed6b44e97b00315b8173abf454':
JRO03P
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:12:02 +0000 (18:12 -0700)]
am
021ff2ee: am
9edfa6db: docs: move home.css into default.css to reduce number of requests
* commit '
021ff2ee388bdb548ae55b349535d14e0423207c':
docs: move home.css into default.css to reduce number of requests
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
Doug Zongker [Tue, 14 Aug 2012 23:36:15 +0000 (16:36 -0700)]
allow diff program to be selected explicitly
Change-Id: I1d8df9cc3ed35cc5983bc50fc13975db32072dbe
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
Jesse Hall [Tue, 14 Aug 2012 22:31:42 +0000 (15:31 -0700)]
Merge "Include FusedLocation.apk on sdk builds too" into jb-mr1-dev
Jesse Hall [Tue, 14 Aug 2012 20:34:10 +0000 (13:34 -0700)]
Include FusedLocation.apk on sdk builds too
Bug:
6969889
Change-Id: Ifda8df58906b3e1d77de0f7de0b1dd07c6bf430f
Ying Wang [Tue, 14 Aug 2012 18:08:03 +0000 (11:08 -0700)]
Force out LOCAL_NDK_VERSION.
Change-Id: I0a9f1a630ef2019bed38d420525eac9510b09798
Ying Wang [Tue, 14 Aug 2012 17:13:16 +0000 (10:13 -0700)]
Retire LOCAL_NDK_VERSION.
We are now unifying the NDK versions of unbundled native code to always
use the latest NDK.
We don't need the variable LOCAL_NDK_VERSION now.
To build native code with NDK, you need set just LOCAL_SDK_VERSION.
Bug:
6932421
Change-Id: I86f05a264249cda6bae97b4b1616f03700cd9dfa
Ying Wang [Tue, 14 Aug 2012 18:57:01 +0000 (11:57 -0700)]
Merge "Adopt the new prebuilts/ndk/<number> paths." into jb-mr1-dev
Ying Wang [Fri, 10 Aug 2012 17:57:37 +0000 (10:57 -0700)]
Adopt the new prebuilts/ndk/<number> paths.
Bug:
6932421
Change-Id: Iba7200aacef2201001f92c6ffa020881f0b528ea
Jean-Baptiste Queru [Tue, 14 Aug 2012 18:55:19 +0000 (11:55 -0700)]
am
7159a992: am
4eddad55: Merge "Set the AOSP master to be API level 16"
* commit '
7159a992ddcda51c91843a29cd1aa30815bc8370':
Set the AOSP master to be API level 16
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:26:06 +0000 (16:26 -0700)]
am
d3d0beca: am
392bdc1f: Merge "Move the selinux modules to core PRODUCT_PACKAGES"
* commit '
d3d0becac9a13836b7c20acba3b21b0625d92324':
Move the selinux modules to core PRODUCT_PACKAGES
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 23:03:29 +0000 (16:03 -0700)]
am
d7547163: am
679b7498: Merge "Add mac_permissions.xml dependency."
* commit '
d7547163d5b0bf9e2cde626c0b7c6a58d48eb89e':
Add mac_permissions.xml dependency.
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 19:00:51 +0000 (12:00 -0700)]
resolved conflicts for merge of
0ac38a4e to jb-mr1-dev
Change-Id: I0978f511f807797f89be4002bca654492231761c
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."
Nick Pelly [Sat, 11 Aug 2012 01:54:22 +0000 (18:54 -0700)]
Merge "Include FusedLocation.apk on all builds." into jb-mr1-dev
Nick Pelly [Sat, 11 Aug 2012 01:50:36 +0000 (18:50 -0700)]
Include FusedLocation.apk on all builds.
Change-Id: Ifc98195b51971ff65e1661f89e08965daefc3506
Guang Zhu [Sat, 11 Aug 2012 01:44:42 +0000 (18:44 -0700)]
Merge "Use new flag for emma instrumented build and limit to apps only" into jb-mr1-dev
Keun young Park [Fri, 10 Aug 2012 23:59:54 +0000 (16:59 -0700)]
add libstagefright_chromium_http to mini for streaming
Change-Id: I27da54d17698c71d36a5761c6debaeb9f55e5856
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
Nick Kralevich [Fri, 10 Aug 2012 21:11:14 +0000 (14:11 -0700)]
Merge "arm: add --warn-shared-textrel" into jb-mr1-dev
Nick Kralevich [Fri, 10 Aug 2012 19:51:26 +0000 (12:51 -0700)]
arm: add --warn-shared-textrel
Emit a warning when the static linker detects a shared library
has text relocations. Text relocations make it harder to
share pages across processes, and make it harder to use
certain memory protection features in, for example, SELinux.
This warning will turn into an error in a future change
(via --fatal-warnings)
References: http://www.akkadia.org/drepper/textrelocs.html
Change-Id: I3bc818e3ecdb8a4338668a9e816b6dc1081b7557
Jean-Baptiste Queru [Fri, 10 Aug 2012 19:43:59 +0000 (12:43 -0700)]
am
2387857d: am
968f20a4: Merge "MIPS support to *.mk files and envsetup.sh"
* commit '
2387857dad06b3437ffcf0c14e2bc9f5956a5888':
MIPS support to *.mk files and envsetup.sh
Jean-Baptiste Queru [Fri, 10 Aug 2012 19:43:58 +0000 (12:43 -0700)]
am
64b8c6e9: am
6e6d92c4: Merge "Support for MIPS Build targets."
* commit '
64b8c6e936ae713a61c53a85a0badbd7d480e414':
Support for MIPS Build targets.
Jean-Baptiste Queru [Fri, 10 Aug 2012 19:42:18 +0000 (12:42 -0700)]
resolved conflicts for merge of
dd14acc3 to jb-mr1-dev
Change-Id: Ic900c623a7c7fd20c965b8d838caf0f01ceab53f
The Android Open Source Project [Fri, 10 Aug 2012 19:36:39 +0000 (12:36 -0700)]
am
d4c6a2ed: (-s ours) Reconcile with jb-mr0-release - do not merge
* commit '
d4c6a2edde97a7709086e9a3b7ecb028cecd9bfb':
JZO40
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"