Elliott Hughes
a8352cac8d
am 0fc8d635
: am f2a618e1
: Merge "The zoneinfo stuff is no longer legacy."
...
* commit '0fc8d635a7f3712cc24f7a29d97755bc15972a0a':
The zoneinfo stuff is no longer legacy.
2012-08-15 20:03:54 -07:00
Elliott Hughes
0fc8d635a7
am f2a618e1
: Merge "The zoneinfo stuff is no longer legacy."
...
* commit 'f2a618e1df126c6c48622cce948825e923b52dcb':
The zoneinfo stuff is no longer legacy.
2012-08-15 20:02:49 -07:00
Elliott Hughes
f2a618e1df
Merge "The zoneinfo stuff is no longer legacy."
2012-08-15 19:43:41 -07:00
Elliott Hughes
e1654eaccb
The zoneinfo stuff is no longer legacy.
...
Change-Id: I7f76dfc15c0b2febbcdb13f12ff9390dca124585
2012-08-15 18:34:49 -07:00
Keun young Park
a8811fda4f
fix MIPS build
...
- crtxx.o built under TARGET_OUT_INTERMEDIATE_LIBRARIES,
not under TARGET_OUT_STATIC_LIBRARIES
Change-Id: Ife05206bd66f691853100bbf17e08a13c287d073
2012-08-15 13:42:37 -07:00
Keun young Park
8182182182
fix PDK boot issue
...
- add missing packages to make it boot
Change-Id: I9a4a635e67a82c326f9eb1eceb86cffc8f59a2d3
2012-08-15 11:32:23 -07:00
Iliyan Malchev
0016a9ba8d
Merge "build: register BOARD_HAVE_BLUETOOTH_QCOM" into jb-mr1-dev
2012-08-15 09:18:12 -07:00
Iliyan Malchev
0854694c51
build: register BOARD_HAVE_BLUETOOTH_QCOM
...
Change-Id: I594abd6d3b152a4e5bc48b6ac447e155c85b2fe0
Signed-off-by: Iliyan Malchev <malchev@google.com >
2012-08-15 08:12:06 -07:00
The Android Open Source Project
0062f811c0
am 1a0f6725
: (-s ours) Reconcile with jb-release - do not merge
...
* commit '1a0f6725392279ed6b44e97b00315b8173abf454':
JRO03P
2012-08-15 08:05:37 -07:00
The Android Open Source Project
1a0f672539
Reconcile with jb-release - do not merge
...
Change-Id: I3ea7d0a8c3865290f404bb24b464fcfb7410dd0e
2012-08-15 08:04:29 -07:00
Scott Main
d3ee366af2
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
2012-08-14 18:12:02 -07:00
Scott Main
021ff2ee38
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
2012-08-14 18:10:52 -07:00
Doug Zongker
24cd280328
allow diff program to be selected explicitly
...
Change-Id: I1d8df9cc3ed35cc5983bc50fc13975db32072dbe
2012-08-14 16:36:15 -07:00
Scott Main
9edfa6db8c
docs: move home.css into default.css to reduce number of requests
...
Change-Id: I156182c5ad1545f570808af565948cbd3c05a3ee
2012-08-14 16:28:45 -07:00
Jesse Hall
8513b62f6a
Merge "Include FusedLocation.apk on sdk builds too" into jb-mr1-dev
2012-08-14 15:31:42 -07:00
Jesse Hall
9d04cc4ef2
Include FusedLocation.apk on sdk builds too
...
Bug: 6969889
Change-Id: Ifda8df58906b3e1d77de0f7de0b1dd07c6bf430f
2012-08-14 13:34:43 -07:00
Ying Wang
27d51bf6d3
Force out LOCAL_NDK_VERSION.
...
Change-Id: I0a9f1a630ef2019bed38d420525eac9510b09798
2012-08-14 13:06:22 -07:00
Ying Wang
54fdb473b6
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
2012-08-14 11:58:13 -07:00
Ying Wang
d4f0ffcb6b
Merge "Adopt the new prebuilts/ndk/<number> paths." into jb-mr1-dev
2012-08-14 11:57:01 -07:00
Ying Wang
7f8d0ba6bd
Adopt the new prebuilts/ndk/<number> paths.
...
Bug: 6932421
Change-Id: Iba7200aacef2201001f92c6ffa020881f0b528ea
2012-08-14 11:55:46 -07:00
Jean-Baptiste Queru
1196c82491
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
2012-08-14 11:55:19 -07:00
Jean-Baptiste Queru
7159a992dd
am 4eddad55
: Merge "Set the AOSP master to be API level 16"
...
* commit '4eddad550ee81edba01734bf378612ed18841751':
Set the AOSP master to be API level 16
2012-08-14 11:53:40 -07:00
Jean-Baptiste Queru
4eddad550e
Merge "Set the AOSP master to be API level 16"
2012-08-14 10:51:21 -07:00
Jean-Baptiste Queru
e46e8603b2
Set the AOSP master to be API level 16
...
Change-Id: I3ba4317aa1081ae5f60ac8504cfff8f4abee5e66
2012-08-14 09:07:33 -07:00
Ying Wang
f59a64b7cb
am d3d0beca
: am 392bdc1f
: Merge "Move the selinux modules to core PRODUCT_PACKAGES"
...
* commit 'd3d0becac9a13836b7c20acba3b21b0625d92324':
Move the selinux modules to core PRODUCT_PACKAGES
2012-08-13 16:26:06 -07:00
Ying Wang
d3d0becac9
am 392bdc1f
: Merge "Move the selinux modules to core PRODUCT_PACKAGES"
...
* commit '392bdc1f08eb03ad04eba24a76cc0aea7e1b46d6':
Move the selinux modules to core PRODUCT_PACKAGES
2012-08-13 16:24:11 -07:00
The Android Automerger
add1fb4607
JRO03P
2012-08-13 16:07:45 -07:00
Ying Wang
4150db6905
am d7547163
: am 679b7498
: Merge "Add mac_permissions.xml dependency."
...
* commit 'd7547163d5b0bf9e2cde626c0b7c6a58d48eb89e':
Add mac_permissions.xml dependency.
2012-08-13 16:03:29 -07:00
Ying Wang
392bdc1f08
Merge "Move the selinux modules to core PRODUCT_PACKAGES"
2012-08-13 15:41:12 -07:00
Ying Wang
82ccebaa59
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
2012-08-13 15:40:43 -07:00
Ying Wang
d7547163d5
am 679b7498
: Merge "Add mac_permissions.xml dependency."
...
* commit '679b7498af86ee084791e86d06eaad87fe2f27f0':
Add mac_permissions.xml dependency.
2012-08-13 15:17:45 -07:00
Ying Wang
679b7498af
Merge "Add mac_permissions.xml dependency."
2012-08-13 14:52:24 -07:00
Elliott Hughes
880d3f39f7
resolved conflicts for merge of 0ac38a4e
to jb-mr1-dev
...
Change-Id: I0978f511f807797f89be4002bca654492231761c
2012-08-11 12:00:51 -07:00
Elliott Hughes
0ac38a4e5e
am 20e713d1
: Merge "Remove TARGET_linux-sh.mk."
...
* commit '20e713d151dde66058453ec822b6bca8793008a4':
Remove TARGET_linux-sh.mk.
2012-08-11 11:51:39 -07:00
Elliott Hughes
20e713d151
Merge "Remove TARGET_linux-sh.mk."
2012-08-11 09:34:51 -07:00
Nick Pelly
0de821b0b1
Merge "Include FusedLocation.apk on all builds." into jb-mr1-dev
2012-08-10 18:54:23 -07:00
Nick Pelly
48d55d3777
Include FusedLocation.apk on all builds.
...
Change-Id: Ifc98195b51971ff65e1661f89e08965daefc3506
2012-08-10 18:50:36 -07:00
Guang Zhu
62f034792d
Merge "Use new flag for emma instrumented build and limit to apps only" into jb-mr1-dev
2012-08-10 18:44:43 -07:00
Keun young Park
f15a11c58d
add libstagefright_chromium_http to mini for streaming
...
Change-Id: I27da54d17698c71d36a5761c6debaeb9f55e5856
2012-08-10 16:59:54 -07:00
Elliott Hughes
5f6c7fd884
Remove TARGET_linux-sh.mk.
...
SH support is long gone from bionic and dalvik.
Change-Id: I613df5f0062d743686847610737af9a321eec1da
2012-08-10 15:36:51 -07:00
Nick Kralevich
62481e30f3
Merge "arm: add --warn-shared-textrel" into jb-mr1-dev
2012-08-10 14:11:14 -07:00
Nick Kralevich
b238210c01
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
2012-08-10 13:05:53 -07:00
Jean-Baptiste Queru
049d97d778
am 2387857d
: am 968f20a4
: Merge "MIPS support to *.mk files and envsetup.sh"
...
* commit '2387857dad06b3437ffcf0c14e2bc9f5956a5888':
MIPS support to *.mk files and envsetup.sh
2012-08-10 12:43:59 -07:00
Jean-Baptiste Queru
c244634e8f
am 64b8c6e9
: am 6e6d92c4
: Merge "Support for MIPS Build targets."
...
* commit '64b8c6e936ae713a61c53a85a0badbd7d480e414':
Support for MIPS Build targets.
2012-08-10 12:43:58 -07:00
Jean-Baptiste Queru
91afae6c03
resolved conflicts for merge of dd14acc3
to jb-mr1-dev
...
Change-Id: Ic900c623a7c7fd20c965b8d838caf0f01ceab53f
2012-08-10 12:42:18 -07:00
The Android Open Source Project
baa9701214
am d4c6a2ed
: (-s ours) Reconcile with jb-mr0-release - do not merge
...
* commit 'd4c6a2edde97a7709086e9a3b7ecb028cecd9bfb':
JZO40
2012-08-10 12:36:39 -07:00
Jean-Baptiste Queru
2387857dad
am 968f20a4
: Merge "MIPS support to *.mk files and envsetup.sh"
...
* commit '968f20a4c2ffca9a0cf8870bd96c77e65ca61243':
MIPS support to *.mk files and envsetup.sh
2012-08-10 09:23:42 -07:00
Jean-Baptiste Queru
64b8c6e936
am 6e6d92c4
: Merge "Support for MIPS Build targets."
...
* commit '6e6d92c47acbb976ce47ae4d90406fa56ea68a3a':
Support for MIPS Build targets.
2012-08-10 09:23:39 -07:00
Jean-Baptiste Queru
dd14acc3f6
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
2012-08-10 09:23:38 -07:00
Jean-Baptiste Queru
968f20a4c2
Merge "MIPS support to *.mk files and envsetup.sh"
2012-08-10 09:16:20 -07:00