OSDN Git Service
Ying Wang [Fri, 14 Oct 2011 00:31:45 +0000 (17:31 -0700)]
Support to package prebuilt NDK libstlport_shared.so into apk
To package libstlport_shared.so, use the following syntax in the app
module definition:
LOCAL_NDK_STL_VARIANT := stlport_shared
LOCAL_NDK_VERSION := <num>
The rationale behind is:
The NDK prebiult libstlport_shared.so is intentionally different from
the system libstlport.so.
Essentially they are slightly different versions of the library so
shouldn't be mixed up.
libstlport.so is used by the system, but not exposed by the NDK, it is
routinely tweaked in various ways between platform releases, and there
is no guarantee that its ABI is stable, or that it will not be replaced
by something else in the future.
libstlport_shared.so is typically distributed with application packages,
and should not be part of the system.
Change-Id: I72c9911781f7d8402687e9891f3f605f3a60be22
The Android Open Source Project [Thu, 13 Oct 2011 14:04:45 +0000 (07:04 -0700)]
Reconcile with ics-mr0-release
Change-Id: I58ba7ea1f3e87dcc5fc13ce213a221a311dc4eff
The Android Automerger [Thu, 13 Oct 2011 13:30:07 +0000 (06:30 -0700)]
ICL13
The Android Automerger [Thu, 13 Oct 2011 13:27:08 +0000 (06:27 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
Dima Zavin [Wed, 12 Oct 2011 20:50:40 +0000 (13:50 -0700)]
am
854233e9: core: remove the built fake packages (not installed) on installclean
* commit '
854233e9b2e24c75f63db96bb1be9a7bb2cecd84':
core: remove the built fake packages (not installed) on installclean
Dima Zavin [Wed, 12 Oct 2011 20:34:25 +0000 (13:34 -0700)]
core: remove the built fake packages (not installed) on installclean
Change-Id: I1ff3754132a48c545d0a3215ae23d204aba50637
Signed-off-by: Dima Zavin <dima@android.com>
The Android Automerger [Wed, 12 Oct 2011 20:30:05 +0000 (13:30 -0700)]
ICL12B
Yuli Huang [Wed, 12 Oct 2011 16:37:35 +0000 (09:37 -0700)]
am
5b124642: Remove PhotoEditor from mk file.
* commit '
5b124642b53c6545b8d353f50e05229350f89e13':
Remove PhotoEditor from mk file.
Yuli Huang [Wed, 12 Oct 2011 16:28:28 +0000 (00:28 +0800)]
Remove PhotoEditor from mk file.
Change-Id: Ia650e4dac0babb82fe2cb43073126f9e93b57362
The Android Open Source Project [Wed, 12 Oct 2011 15:48:41 +0000 (08:48 -0700)]
Reconcile with ics-factoryrom-release ics-mr0-release
Change-Id: Ic2b248f0ade713e7ba984cbe093afe50bc931ad2
The Android Automerger [Wed, 12 Oct 2011 14:06:18 +0000 (07:06 -0700)]
ICL12
The Android Automerger [Wed, 12 Oct 2011 13:22:34 +0000 (06:22 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Wed, 12 Oct 2011 01:08:39 +0000 (18:08 -0700)]
IFL10C
Dima Zavin [Wed, 12 Oct 2011 00:32:50 +0000 (17:32 -0700)]
am
7dac5909: core: remove fake package timestamps on installclean
* commit '
7dac5909d23a78ff6ed2af6e4d937354de8c7756':
core: remove fake package timestamps on installclean
Dima Zavin [Tue, 11 Oct 2011 22:54:10 +0000 (15:54 -0700)]
core: remove fake package timestamps on installclean
Change-Id: Ic07af1f751b301b69fa5cbbb7bf51ad718d54d52
Signed-off-by: Dima Zavin <dima@android.com>
Ying Wang [Tue, 11 Oct 2011 17:11:44 +0000 (10:11 -0700)]
Merge "Use shell variable to eliminate $(eval) in commands."
Android Git Automerger [Tue, 11 Oct 2011 17:10:35 +0000 (10:10 -0700)]
Merge branch 'master' of ssh://android-git:29418/platform/build
Ying Wang [Tue, 11 Oct 2011 17:01:50 +0000 (10:01 -0700)]
Merge "Enforce no nonexistent modules in PRODUCT_PACKAGES for sdk builds"
Ying Wang [Tue, 11 Oct 2011 17:01:25 +0000 (10:01 -0700)]
Merge "Remove PRODUCT_CONTRIBUTORS_FILE which is no longer in use."
The Android Automerger [Tue, 11 Oct 2011 15:46:03 +0000 (08:46 -0700)]
IFL10B
The Android Automerger [Tue, 11 Oct 2011 15:40:03 +0000 (08:40 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
Ed Heyl [Tue, 11 Oct 2011 13:40:06 +0000 (06:40 -0700)]
mr0 - do not merge
Change-Id: I3b19b8cdad6820bc8ab2047ac48cb2964132a3fa
Ed Heyl [Tue, 11 Oct 2011 13:37:24 +0000 (06:37 -0700)]
ICL11
Change-Id: Icaeb0485cca6a5d1862c27df62fa29c9780dfa1d
The Android Open Source Project [Tue, 11 Oct 2011 11:29:21 +0000 (04:29 -0700)]
Reconcile with ics-factoryrom-release
Change-Id: I0a35a81c49649458f8c02b093a8638539c65049d
The Android Automerger [Tue, 11 Oct 2011 03:40:43 +0000 (20:40 -0700)]
IFL10
The Android Automerger [Tue, 11 Oct 2011 03:37:22 +0000 (20:37 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
Ying Wang [Sat, 8 Oct 2011 21:31:54 +0000 (14:31 -0700)]
Enforce no nonexistent modules in PRODUCT_PACKAGES for sdk builds
Bug:
5430740
- Remove nonexistent names in PRODUCT_PACKAGES.
- Push down bluetooth-health, hostapd and wpa_supplicant.conf to
generic_no_telephony.mk and large_emu_hw.mk because they are not needed
by sdk builds.
- Remove core.mk from generic_armv5.mk and generic_x86.mk because they
already inherit from generic.mk.
Change-Id: Ie44b95f1cae7ed0d4cf827ffce6a91d41902434d
Ying Wang [Mon, 10 Oct 2011 16:54:47 +0000 (09:54 -0700)]
Remove PRODUCT_CONTRIBUTORS_FILE which is no longer in use.
Bug:
5433204
Change-Id: Id88c21f8d1991d8cbcc5bb7dae784aa72dc4becf
The Android Open Source Project [Mon, 10 Oct 2011 14:27:25 +0000 (07:27 -0700)]
Reconcile with ics-factoryrom-release
Change-Id: Ibd9094406b6984d8a27179eb934edc05d3a43321
The Android Automerger [Sun, 9 Oct 2011 20:31:47 +0000 (13:31 -0700)]
IFL09
The Android Automerger [Sun, 9 Oct 2011 20:28:28 +0000 (13:28 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
The Android Automerger [Sat, 8 Oct 2011 05:23:44 +0000 (22:23 -0700)]
IFL07B
The Android Automerger [Sat, 8 Oct 2011 05:22:43 +0000 (22:22 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
The Android Open Source Project [Sat, 8 Oct 2011 02:06:12 +0000 (19:06 -0700)]
Reconcile with ics-factoryrom-release
Change-Id: I5b9b2250b49befd6afd87ed426c4883e006bf292
The Android Automerger [Sat, 8 Oct 2011 01:15:16 +0000 (18:15 -0700)]
IFL07
The Android Automerger [Sat, 8 Oct 2011 01:12:00 +0000 (18:12 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
The Android Open Source Project [Fri, 7 Oct 2011 12:35:30 +0000 (05:35 -0700)]
Reconcile with honeycomb-LTE-release ics-factoryrom-release
Change-Id: I1a4e39e9520e2574fa8e4cdcf37c4c05a0017895
The Android Automerger [Fri, 7 Oct 2011 05:44:00 +0000 (22:44 -0700)]
IFL06C
The Android Automerger [Fri, 7 Oct 2011 05:43:40 +0000 (22:43 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
The Android Automerger [Fri, 7 Oct 2011 03:54:42 +0000 (20:54 -0700)]
IFL06B
The Android Automerger [Fri, 7 Oct 2011 03:51:13 +0000 (20:51 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
The Android Automerger [Fri, 7 Oct 2011 00:18:08 +0000 (17:18 -0700)]
HLK75D
The Android Open Source Project [Thu, 6 Oct 2011 14:45:19 +0000 (07:45 -0700)]
Reconcile with ics-factoryrom-release
Change-Id: I6bcfc3069e62fe077704a9454abdd33e364cc637
The Android Automerger [Thu, 6 Oct 2011 14:28:47 +0000 (07:28 -0700)]
IFL06
The Android Automerger [Thu, 6 Oct 2011 14:21:34 +0000 (07:21 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
The Android Open Source Project [Thu, 6 Oct 2011 12:44:04 +0000 (05:44 -0700)]
Reconcile with ics-factoryrom-release
Change-Id: I7c2f0791fec871bd499afc9eaa41fd1dc55b91c5
The Android Automerger [Thu, 6 Oct 2011 02:00:34 +0000 (19:00 -0700)]
IFL05C
The Android Automerger [Thu, 6 Oct 2011 01:58:14 +0000 (18:58 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
The Android Open Source Project [Wed, 5 Oct 2011 23:15:57 +0000 (16:15 -0700)]
Reconcile with ics-factoryrom-release
Change-Id: Ic9d7efb8cb6228820010bb55973cef63b93b8e65
The Android Automerger [Wed, 5 Oct 2011 23:09:01 +0000 (16:09 -0700)]
IFL05B
The Android Automerger [Wed, 5 Oct 2011 23:05:31 +0000 (16:05 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
Scott Main [Wed, 5 Oct 2011 20:58:25 +0000 (13:58 -0700)]
Merge "docs: add ics logo for homepage"
Scott Main [Wed, 5 Oct 2011 20:53:36 +0000 (13:53 -0700)]
docs: add ics logo for homepage
Change-Id: I57504ce0919c88fd28ef550775b012b6c3d8498f
Doug Zongker [Wed, 5 Oct 2011 20:06:30 +0000 (13:06 -0700)]
am
49c6a2b5: fix build fingerprint: dev-keys vs test-keys
* commit '
49c6a2b5e4314bd8acfbca88cd43ea49a2c8c30e':
fix build fingerprint: dev-keys vs test-keys
Doug Zongker [Wed, 5 Oct 2011 19:41:56 +0000 (12:41 -0700)]
fix build fingerprint: dev-keys vs test-keys
The fingerprint should only say dev-keys if it's actually using custom
keys; builds with the old default (from build/target/product/security)
should still say test-keys.
Change-Id: Ib8c662c348cf63f5db47e2f8f81bc3246cb15fdc
Doug Zongker [Wed, 5 Oct 2011 18:32:16 +0000 (11:32 -0700)]
am
ad4142cc: Merge "add missing parameter to ReplaceOtaKeys" into ics-factoryrom
* commit '
ad4142cce8e8a4fe8c9cbfe92a49428ea789986e':
add missing parameter to ReplaceOtaKeys
Doug Zongker [Wed, 5 Oct 2011 18:29:27 +0000 (11:29 -0700)]
Merge "add missing parameter to ReplaceOtaKeys" into ics-factoryrom
Doug Zongker [Wed, 5 Oct 2011 18:23:06 +0000 (11:23 -0700)]
add missing parameter to ReplaceOtaKeys
Change-Id: Ib596235a8e3b3588d363fea82b92b69895ee5408
Doug Zongker [Wed, 5 Oct 2011 16:58:05 +0000 (09:58 -0700)]
am
f9ede7e9: Merge "sign non-PRESIGNED prebuilt apks" into ics-factoryrom
* commit '
f9ede7e925a668cc8c0b44cb69c0795cb6c8c896':
sign non-PRESIGNED prebuilt apks
Doug Zongker [Wed, 5 Oct 2011 16:55:58 +0000 (09:55 -0700)]
Merge "sign non-PRESIGNED prebuilt apks" into ics-factoryrom
Doug Zongker [Wed, 5 Oct 2011 15:16:30 +0000 (08:16 -0700)]
sign non-PRESIGNED prebuilt apks
Since dev keys can now vary per device, we can't assume they are
checked in with the correct signature.
Change-Id: I7577a3a6bd98d005c15936c99b2944acc4412798
Ying Wang [Wed, 5 Oct 2011 16:09:38 +0000 (09:09 -0700)]
am
0611aeed: Merge "Install path support for vendor modules." into ics-factoryrom
* commit '
0611aeedeb58bf4df1f1143f602aa64c8dbddc35':
Install path support for vendor modules.
Ying Wang [Wed, 5 Oct 2011 16:07:53 +0000 (09:07 -0700)]
Merge "Install path support for vendor modules." into ics-factoryrom
The Android Automerger [Wed, 5 Oct 2011 13:41:13 +0000 (06:41 -0700)]
IFL05
The Android Automerger [Wed, 5 Oct 2011 13:37:40 +0000 (06:37 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
The Android Open Source Project [Wed, 5 Oct 2011 13:13:05 +0000 (06:13 -0700)]
Reconcile with ics-factoryrom-release
Change-Id: I0889aad04af7434aa750ff2152a4ea7a0d0279e3
The Android Automerger [Wed, 5 Oct 2011 04:35:24 +0000 (21:35 -0700)]
IFL04E
The Android Automerger [Tue, 4 Oct 2011 23:30:32 +0000 (16:30 -0700)]
IFL04D
Doug Zongker [Thu, 22 Sep 2011 17:28:04 +0000 (10:28 -0700)]
change OTA tools to handle variable dev keys
The signing and OTA-building tools now understand the
default_sys_dev_certificate value which may be present in the
META/misc_info.txt file of the target-files packages.
Change-Id: I64f09ec0b77a5184b6ddb74019255518776ee773
The Android Automerger [Tue, 4 Oct 2011 23:17:19 +0000 (16:17 -0700)]
IFL04C
Ying Wang [Tue, 4 Oct 2011 17:50:08 +0000 (10:50 -0700)]
Support for product-specific dev keys.
Change-Id: Id577a72ee9f7cd70e8ca77efcbf10a37885c7d6f
Ed Heyl [Tue, 4 Oct 2011 23:15:25 +0000 (16:15 -0700)]
am
81703a19: Merge "Support for product-specific dev keys." into ics-factoryrom
* commit '
81703a19001ec219c35cb0ecf9bafb6e0dbc1e1d':
Support for product-specific dev keys.
Doug Zongker [Tue, 4 Oct 2011 23:13:47 +0000 (16:13 -0700)]
am
831840e5: change OTA tools to handle variable dev keys
* commit '
831840e51b0403671f746ebc32090b7d6e548c08':
change OTA tools to handle variable dev keys
Ed Heyl [Tue, 4 Oct 2011 23:13:38 +0000 (16:13 -0700)]
Merge "Support for product-specific dev keys." into ics-factoryrom
Doug Zongker [Thu, 22 Sep 2011 17:28:04 +0000 (10:28 -0700)]
change OTA tools to handle variable dev keys
The signing and OTA-building tools now understand the
default_sys_dev_certificate value which may be present in the
META/misc_info.txt file of the target-files packages.
Change-Id: I64f09ec0b77a5184b6ddb74019255518776ee773
Xavier Ducrohet [Tue, 4 Oct 2011 21:26:08 +0000 (14:26 -0700)]
Merge "Put en_US as first product locale for SDK builds."
Xavier Ducrohet [Tue, 4 Oct 2011 21:20:56 +0000 (14:20 -0700)]
Put en_US as first product locale for SDK builds.
Change-Id: I7b6dfa066aca75ba8d315bddf2492f81311a7761
The Android Automerger [Tue, 4 Oct 2011 21:02:12 +0000 (14:02 -0700)]
IFL04B
The Android Automerger [Tue, 4 Oct 2011 20:59:05 +0000 (13:59 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
The Android Open Source Project [Tue, 4 Oct 2011 20:56:38 +0000 (13:56 -0700)]
Reconcile with ics-factoryrom-release
Change-Id: I223d353a699f6f258e2a2e47f81d528879c4381b
Ying Wang [Tue, 4 Oct 2011 17:50:08 +0000 (10:50 -0700)]
Support for product-specific dev keys.
Change-Id: Id577a72ee9f7cd70e8ca77efcbf10a37885c7d6f
Ying Wang [Tue, 4 Oct 2011 17:14:43 +0000 (10:14 -0700)]
Merge "Enforce no prebuilt apks in PRODUCT_COPY_FILES."
The Android Automerger [Tue, 4 Oct 2011 13:30:21 +0000 (06:30 -0700)]
IFL04
The Android Automerger [Tue, 4 Oct 2011 13:27:17 +0000 (06:27 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
Xavier Ducrohet [Tue, 4 Oct 2011 02:42:07 +0000 (19:42 -0700)]
Also package xhdpi res in the SDK image.
Change-Id: I39977f70b63353d1d61bbbef6207973ba2876ff9
The Android Automerger [Mon, 3 Oct 2011 23:50:01 +0000 (16:50 -0700)]
IFL03C
The Android Automerger [Mon, 3 Oct 2011 23:49:41 +0000 (16:49 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
Scott Main [Mon, 3 Oct 2011 22:34:32 +0000 (15:34 -0700)]
docs: fix visual bug in the search tabs.
I assume this was introduced by a change in the CSE implementation
Change-Id: I776e385fd6c0d738a4bbf8372911b205c1f98123
The Android Automerger [Mon, 3 Oct 2011 21:55:41 +0000 (14:55 -0700)]
IFL03B
The Android Automerger [Mon, 3 Oct 2011 21:51:54 +0000 (14:51 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
Scott Main [Mon, 3 Oct 2011 20:01:43 +0000 (13:01 -0700)]
docs: add 'reference' class for use with 'special' to refine the headings
used within the 'special' div when in the reference.
Change-Id: Iebf84484e2eda104b2247aefc5a539f2a62c5102
The Android Open Source Project [Mon, 3 Oct 2011 14:41:03 +0000 (07:41 -0700)]
Reconcile with ics-factoryrom-release
Change-Id: I51b4b8d176ec0513747cded7d63a45ab0c527abd
The Android Automerger [Mon, 3 Oct 2011 13:30:22 +0000 (06:30 -0700)]
IFL03
The Android Automerger [Mon, 3 Oct 2011 13:27:14 +0000 (06:27 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
The Android Open Source Project [Fri, 30 Sep 2011 21:31:56 +0000 (14:31 -0700)]
Reconcile with ics-factoryrom-release
Change-Id: I07c391b65a870c4d557a51cc4ed00a5f9474cfed
The Android Automerger [Fri, 30 Sep 2011 21:08:49 +0000 (14:08 -0700)]
IFK92C
The Android Automerger [Fri, 30 Sep 2011 21:08:26 +0000 (14:08 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
The Android Open Source Project [Fri, 30 Sep 2011 20:24:17 +0000 (13:24 -0700)]
Reconcile with ics-factoryrom-release
Change-Id: I859743c56d3721278fed7e22b7d41d0592b00118
The Android Automerger [Fri, 30 Sep 2011 20:14:43 +0000 (13:14 -0700)]
IFK92B
The Android Automerger [Fri, 30 Sep 2011 20:11:02 +0000 (13:11 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom