OSDN Git Service
Scott Main [Wed, 26 Oct 2011 20:17:45 +0000 (20:17 +0000)]
am
8bb6ea59: Merge "docs: add new style for adding "deprecated" messages to dev guides" into ics-mr0
* commit '
8bb6ea5995a30df8fb94bbfa041094a5f224321c':
docs: add new style for adding "deprecated" messages to dev guides
Scott Main [Wed, 26 Oct 2011 20:16:13 +0000 (13:16 -0700)]
Merge "docs: add new style for adding "deprecated" messages to dev guides" into ics-mr0
Ed Heyl [Tue, 25 Oct 2011 14:23:21 +0000 (07:23 -0700)]
set ID to MR1. Please do not merge.
Change-Id: Ib181d19806a2589ec124b648e2d12c5350b0ce81
Scott Main [Mon, 24 Oct 2011 23:45:58 +0000 (16:45 -0700)]
docs: add new style for adding "deprecated" messages to dev guides
Change-Id: I0d690a6c0880343919114370331b7c2756b6a50e
The Android Open Source Project [Mon, 24 Oct 2011 13:32:01 +0000 (06:32 -0700)]
Reconcile with ics-factoryrom-release ics-mr0-release
Change-Id: Ib5fff2dcdcfd889d707ff2eef25ba806e22f8b85
The Android Automerger [Mon, 24 Oct 2011 13:28:08 +0000 (06:28 -0700)]
ICL24
The Android Automerger [Mon, 24 Oct 2011 13:27:09 +0000 (06:27 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Sun, 23 Oct 2011 23:45:00 +0000 (16:45 -0700)]
ICL23D
The Android Automerger [Sun, 23 Oct 2011 23:44:57 +0000 (16:44 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Sun, 23 Oct 2011 23:33:06 +0000 (16:33 -0700)]
ICL23C
The Android Automerger [Sun, 23 Oct 2011 23:32:11 +0000 (16:32 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Sun, 23 Oct 2011 18:41:30 +0000 (11:41 -0700)]
ICL23B
The Android Automerger [Sun, 23 Oct 2011 18:40:31 +0000 (11:40 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Sun, 23 Oct 2011 13:28:10 +0000 (06:28 -0700)]
ICL23
The Android Automerger [Sun, 23 Oct 2011 13:27:06 +0000 (06:27 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Sat, 22 Oct 2011 23:57:57 +0000 (16:57 -0700)]
ICL22
The Android Automerger [Sat, 22 Oct 2011 23:56:22 +0000 (16:56 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Sat, 22 Oct 2011 06:26:12 +0000 (23:26 -0700)]
ICL21C
The Android Automerger [Sat, 22 Oct 2011 06:21:56 +0000 (23:21 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Sat, 22 Oct 2011 00:04:05 +0000 (17:04 -0700)]
ICL21B
Chia-chi Yeh [Fri, 21 Oct 2011 23:45:29 +0000 (16:45 -0700)]
Merge "Move VpnDialogs into core.mk."
Chia-chi Yeh [Fri, 21 Oct 2011 20:59:46 +0000 (13:59 -0700)]
Move VpnDialogs into core.mk.
It is required by the APIs of user space VPN.
Bug:
5495078
Change-Id: I30c309c4f6467a35fca95e76f666799816874752
Chia-chi Yeh [Fri, 21 Oct 2011 23:39:46 +0000 (16:39 -0700)]
am
07767a9e: (-s ours) Move VpnDialogs into core.mk.
* commit '
07767a9e748fdbdab2297974ad01cb265e7fb5a9':
Move VpnDialogs into core.mk.
Wink Saville [Fri, 21 Oct 2011 23:31:55 +0000 (16:31 -0700)]
Change BUILD_ID.
On master branch build id should be MASTER.
Change-Id: I7829b3933947730b298fca8a4e39de6a60b9caad
Chia-chi Yeh [Fri, 21 Oct 2011 23:04:39 +0000 (16:04 -0700)]
Move VpnDialogs into core.mk.
It is required by the APIs of user space VPN.
Also remove the dead VpnServices.
Bug:
5495078
Change-Id: I321b8da16898cd547ed79bea9c264b5e7bc781eb
The Android Automerger [Fri, 21 Oct 2011 22:59:05 +0000 (15:59 -0700)]
ICL21
The Android Automerger [Fri, 21 Oct 2011 22:54:07 +0000 (15:54 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
Tor Norbye [Fri, 21 Oct 2011 02:18:15 +0000 (19:18 -0700)]
Build fix - include sdk/lint in build
Change-Id: Id65b7a3f72dd6c5104738fa872f3beb029d91163
The Android Automerger [Fri, 21 Oct 2011 00:22:10 +0000 (17:22 -0700)]
IFL10F
The Android Automerger [Fri, 21 Oct 2011 00:18:53 +0000 (17:18 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
The Android Automerger [Thu, 20 Oct 2011 22:52:55 +0000 (15:52 -0700)]
ICL20C
The Android Automerger [Thu, 20 Oct 2011 22:47:58 +0000 (15:47 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Thu, 20 Oct 2011 19:38:01 +0000 (12:38 -0700)]
ICL20B
The Android Open Source Project [Thu, 20 Oct 2011 16:17:01 +0000 (09:17 -0700)]
Reconcile with ics-mr0-release
Change-Id: Id2ef87f3662a93f2cedbf1dcb7f0f33d9893637e
The Android Automerger [Thu, 20 Oct 2011 13:32:58 +0000 (06:32 -0700)]
ICL20
The Android Automerger [Thu, 20 Oct 2011 13:32:37 +0000 (06:32 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Thu, 20 Oct 2011 02:03:39 +0000 (19:03 -0700)]
ICL19B
The Android Automerger [Thu, 20 Oct 2011 01:59:30 +0000 (18:59 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
Scott Main [Wed, 19 Oct 2011 23:29:36 +0000 (16:29 -0700)]
am
51372cd2: docs: update "na" style to make opaque, add dropshadow, and re-order z-index to be on top of images
* commit '
51372cd2e564f411ad80821c7adad210bea7d8b7':
docs: update "na" style to make opaque, add dropshadow, and re-order z-index to be on top of images
Scott Main [Wed, 19 Oct 2011 23:09:26 +0000 (16:09 -0700)]
docs: update "na" style to make opaque, add dropshadow, and re-order
z-index to be on top of images
Change-Id: I7c0c2e15d511f4362eb721bf8eb0343fa3f24bc0
The Android Open Source Project [Wed, 19 Oct 2011 14:22:54 +0000 (07:22 -0700)]
Reconcile with ics-mr0-release
Change-Id: Icde55521aef897a6473868d9d8fd0413a4dfd255
The Android Automerger [Wed, 19 Oct 2011 13:30:18 +0000 (06:30 -0700)]
ICL19
The Android Automerger [Wed, 19 Oct 2011 13:27:09 +0000 (06:27 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Wed, 19 Oct 2011 00:00:01 +0000 (17:00 -0700)]
ICL18B
The Android Automerger [Tue, 18 Oct 2011 23:53:28 +0000 (16:53 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
Bjorn Bringert [Tue, 18 Oct 2011 16:48:20 +0000 (09:48 -0700)]
Merge "Compile each proto file separately"
Bjorn Bringert [Tue, 18 Oct 2011 15:08:27 +0000 (16:08 +0100)]
Compile each proto file separately
Before, if a module had several proto source files,
they would all be compiled in a single invocation
of aprotoc. If any of the files imported one of the
other files, you got an aprotoc error about duplicates.
And if you removed the files that were imported
from the list of source files, no Java code
would be generated for the imported files,
causing a Java compile time error.
This changes compiles each proto file separately, which
avoids both of the problems above. It's slightly more
inefficient, but aprotoc is really fast.
Change-Id: I7bd8092ec2953c20269367a1c68ff84acceea3be
The Android Open Source Project [Tue, 18 Oct 2011 14:31:50 +0000 (07:31 -0700)]
Reconcile with ics-mr0-release
Change-Id: I595da4205a7c60207644b445af0491a9aef5a9d3
The Android Automerger [Tue, 18 Oct 2011 13:28:36 +0000 (06:28 -0700)]
ICL18
The Android Automerger [Tue, 18 Oct 2011 13:27:14 +0000 (06:27 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Tue, 18 Oct 2011 03:11:30 +0000 (20:11 -0700)]
ICL17B
The Android Automerger [Tue, 18 Oct 2011 03:07:27 +0000 (20:07 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
Ying Wang [Tue, 18 Oct 2011 03:06:51 +0000 (20:06 -0700)]
am
55370202: Remvoe whisperd from user_tags.mk.
* commit '
5537020242a499e54c351ced962fe437ae1fc4d2':
Remvoe whisperd from user_tags.mk.
Ying Wang [Tue, 18 Oct 2011 00:59:29 +0000 (17:59 -0700)]
Remvoe whisperd from user_tags.mk.
Change-Id: Ib271c568a6e6907d033040dbe6c3574124fbe469
Bug:
5473754
Maarten Hooft [Tue, 18 Oct 2011 00:38:39 +0000 (17:38 -0700)]
am
068bf1a6: Merge " Added Hindi to the list of languages to build under the full target." into ics-mr0
* commit '
068bf1a601d94f9ce8ee9fe9a9fc125e36a7fd02':
Added Hindi to the list of languages to build under the full target.
Maarten Hooft [Tue, 18 Oct 2011 00:37:00 +0000 (17:37 -0700)]
Merge " Added Hindi to the list of languages to build under the full target." into ics-mr0
Maarten Hooft [Mon, 17 Oct 2011 20:40:24 +0000 (13:40 -0700)]
Added Hindi to the list of languages to build under the full target.
Change-Id: I57201097e5ba1337249dde8b6efe704d75bf05b3
The Android Open Source Project [Mon, 17 Oct 2011 19:19:56 +0000 (12:19 -0700)]
Reconcile with ics-factoryrom-release ics-mr0-release
Change-Id: I924918872b02de185bee53d0516fc34b9d3b3f28
Dianne Hackborn [Mon, 17 Oct 2011 18:31:38 +0000 (11:31 -0700)]
am
a0f464a8: New PRODUCT_AAPT_PREF_CONFIG.
* commit '
a0f464a8e7f006177db084df7e925bbb8e5ffed3':
New PRODUCT_AAPT_PREF_CONFIG.
The Android Automerger [Mon, 17 Oct 2011 13:28:18 +0000 (06:28 -0700)]
ICL17
The Android Automerger [Mon, 17 Oct 2011 13:27:08 +0000 (06:27 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Sun, 16 Oct 2011 23:52:55 +0000 (16:52 -0700)]
ICL16B
The Android Automerger [Sun, 16 Oct 2011 23:51:16 +0000 (16:51 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Sun, 16 Oct 2011 13:28:44 +0000 (06:28 -0700)]
ICL16
The Android Automerger [Sun, 16 Oct 2011 13:27:25 +0000 (06:27 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
The Android Automerger [Sat, 15 Oct 2011 19:51:47 +0000 (12:51 -0700)]
IFL10E
The Android Automerger [Sat, 15 Oct 2011 04:59:59 +0000 (21:59 -0700)]
ICL14
The Android Automerger [Sat, 15 Oct 2011 04:55:44 +0000 (21:55 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
Dianne Hackborn [Sat, 15 Oct 2011 02:37:57 +0000 (19:37 -0700)]
New PRODUCT_AAPT_PREF_CONFIG.
To use the new aapt --preferred-configurations option. For use with Prime
to be able to strip everything but xhdpi density bitmaps selectively,
not stripping when this would result in no data for the resource.
Change-Id: I4e1012929b8f9b0b1e79c06496647f69661ba1f2
The Android Automerger [Sat, 15 Oct 2011 00:46:39 +0000 (17:46 -0700)]
IFL10D
The Android Automerger [Sat, 15 Oct 2011 00:43:09 +0000 (17:43 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
The Android Automerger [Fri, 14 Oct 2011 19:58:08 +0000 (12:58 -0700)]
ICL13C
The Android Open Source Project [Fri, 14 Oct 2011 17:52:11 +0000 (10:52 -0700)]
Reconcile with ics-mr0-release
Change-Id: Iddfb8ec409ada196db97434c2f85de1c6954cd1a
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 Automerger [Thu, 13 Oct 2011 23:59:53 +0000 (16:59 -0700)]
ICL13B
The Android Automerger [Thu, 13 Oct 2011 23:56:58 +0000 (16:56 -0700)]
merge in ics-mr0-release history after reset to ics-mr0
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
OSDN Git Service
