OSDN Git Service
Jean-Baptiste Queru [Mon, 26 Sep 2011 20:24:33 +0000 (13:24 -0700)]
Merge "resolved conflicts for merge of
2f2882a0 to master"
The Android Open Source Project [Mon, 26 Sep 2011 19:11:20 +0000 (12:11 -0700)]
Reconcile with ics-factoryrom-release
Change-Id: Idd580f068a34956ba60f34552485123de030ef31
The Android Automerger [Mon, 26 Sep 2011 13:34:40 +0000 (06:34 -0700)]
IFK88
The Android Automerger [Mon, 26 Sep 2011 13:32:18 +0000 (06:32 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
The Android Automerger [Mon, 26 Sep 2011 01:18:02 +0000 (18:18 -0700)]
IFK87B
The Android Automerger [Mon, 26 Sep 2011 01:14:09 +0000 (18:14 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
The Android Automerger [Sun, 25 Sep 2011 13:32:51 +0000 (06:32 -0700)]
IFK87
The Android Automerger [Sun, 25 Sep 2011 13:27:14 +0000 (06:27 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
The Android Automerger [Sat, 24 Sep 2011 00:57:20 +0000 (17:57 -0700)]
IFK85C
Christopher Tate [Fri, 23 Sep 2011 01:24:30 +0000 (18:24 -0700)]
Add the shared-storage backup component to the build
Oops. Fixes bug
5341264
Change-Id: I99c51226c236c40bf56b1b94917f0eff56502963
Ying Wang [Fri, 23 Sep 2011 23:25:36 +0000 (16:25 -0700)]
am
510df1bb: Add lohit-fonts.
* commit '
510df1bb0904292a23b7f12e06fdf7e9307298e4':
Add lohit-fonts.
Ying Wang [Fri, 23 Sep 2011 21:35:51 +0000 (14:35 -0700)]
Add lohit-fonts.
Change-Id: Idf0641ce2d8f8195520e7e283f985271482b2835
Doug Zongker [Fri, 23 Sep 2011 20:51:54 +0000 (13:51 -0700)]
Merge "fix syntax error in OTA script"
The Android Automerger [Fri, 23 Sep 2011 20:39:09 +0000 (13:39 -0700)]
IFK85B
Christopher Tate [Fri, 23 Sep 2011 20:00:52 +0000 (13:00 -0700)]
am
1014de6c: Merge "Add the shared-storage backup component to the build" into ics-factoryrom
* commit '
1014de6cf3b90c6c531beaf8462c17a5f39a8e35':
Add the shared-storage backup component to the build
Christopher Tate [Fri, 23 Sep 2011 19:59:28 +0000 (12:59 -0700)]
Merge "Add the shared-storage backup component to the build" into ics-factoryrom
Doug Zongker [Fri, 23 Sep 2011 19:48:33 +0000 (12:48 -0700)]
fix syntax error in OTA script
Change-Id: I3a9535acb47fc3960020a390dec8d0294a404c2e
The Android Automerger [Fri, 23 Sep 2011 18:38:53 +0000 (11:38 -0700)]
IFK85
The Android Automerger [Fri, 23 Sep 2011 18:33:21 +0000 (11:33 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
David 'Digit' Turner [Fri, 23 Sep 2011 09:44:29 +0000 (11:44 +0200)]
resolved conflicts for merge of
2f2882a0 to master
Change-Id: Ia07eb9d022a8036c2b1674c591514740aa0d4596
Xavier Ducrohet [Fri, 23 Sep 2011 06:39:44 +0000 (23:39 -0700)]
am
4d2b9bf3: (-s ours) Cherrypick
6de7bc61 from do not merge.
* commit '
4d2b9bf341e7978225d6a305c2524ff79f2d18c5':
Cherrypick
6de7bc61 from master. do not merge.
David 'Digit' Turner [Fri, 23 Sep 2011 06:01:17 +0000 (23:01 -0700)]
am
fdb13fcc: am
0cc5e1ef: Merge "sdk: Fix broken google_sdk and google_sdk_x86 add-on build." into gingerbread
* commit '
fdb13fccfecdf526549ad453a20e8136253edb51':
sdk: Fix broken google_sdk and google_sdk_x86 add-on build.
David 'Digit' Turner [Fri, 23 Sep 2011 05:59:07 +0000 (22:59 -0700)]
am
0cc5e1ef: Merge "sdk: Fix broken google_sdk and google_sdk_x86 add-on build." into gingerbread
* commit '
0cc5e1ef457f0eda3a3dfadc094b0e796ba9f3f2':
sdk: Fix broken google_sdk and google_sdk_x86 add-on build.
David 'Digit' Turner [Fri, 23 Sep 2011 05:58:04 +0000 (22:58 -0700)]
Merge "sdk: Fix broken google_sdk and google_sdk_x86 add-on build." into gingerbread
Christopher Tate [Fri, 23 Sep 2011 01:24:30 +0000 (18:24 -0700)]
Add the shared-storage backup component to the build
Oops. Fixes bug
5341264
Change-Id: I99c51226c236c40bf56b1b94917f0eff56502963
The Android Automerger [Thu, 22 Sep 2011 22:43:11 +0000 (15:43 -0700)]
IFK84B
The Android Open Source Project [Thu, 22 Sep 2011 17:57:14 +0000 (10:57 -0700)]
Reconcile with honeycomb-LTE-release ics-factoryrom-release
Change-Id: I1e685412c0dc344067dbeb698d54b638fe3f5bf5
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 [Thu, 22 Sep 2011 13:31:13 +0000 (06:31 -0700)]
IFK84
The Android Automerger [Thu, 22 Sep 2011 13:27:14 +0000 (06:27 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
Scott Main [Thu, 22 Sep 2011 04:07:57 +0000 (21:07 -0700)]
Merge "docs: enable 'updated' tag for resource docs"
Scott Main [Thu, 22 Sep 2011 03:51:54 +0000 (20:51 -0700)]
docs: enable 'updated' tag for resource docs
Change-Id: I070f14247088f6a88dcfdfb352615e588bf3e902
Scott Main [Thu, 22 Sep 2011 01:51:54 +0000 (18:51 -0700)]
Merge "docs: fix javadoc filtering script to not choke on R.styleable class but continue handling provisional api levels"
Scott Main [Thu, 22 Sep 2011 01:38:44 +0000 (18:38 -0700)]
docs: fix javadoc filtering script to not choke on R.styleable class but continue handling provisional api levels
Change-Id: Ia21ea5d4f379fd85d975d1f3fe387c311c7c15aa
Dianne Hackborn [Thu, 22 Sep 2011 01:11:44 +0000 (18:11 -0700)]
Merge "Let's call MR0 4.0.1."
Xavier Ducrohet [Wed, 21 Sep 2011 17:22:19 +0000 (10:22 -0700)]
Cherrypick
6de7bc61 from master. do not merge.
Copy notice file in the new system image folder
Change-Id: I66496f382b2d13b030de569b573630f3abe5b9de
Xavier Ducrohet [Wed, 21 Sep 2011 22:55:04 +0000 (15:55 -0700)]
Merge "Copy notice file in the new system image folder"
Dianne Hackborn [Wed, 21 Sep 2011 22:25:37 +0000 (15:25 -0700)]
Let's call MR0 4.0.1.
Change-Id: Ie55012702e2cfb1eb247941e8b73519ad9b5c547
Xavier Ducrohet [Wed, 21 Sep 2011 17:22:19 +0000 (10:22 -0700)]
Copy notice file in the new system image folder
Change-Id: I4fafe5dc9dc1749de56267206a9b847a97e6a14b
The Android Automerger [Wed, 21 Sep 2011 19:44:06 +0000 (12:44 -0700)]
IFK83B
The Android Automerger [Wed, 21 Sep 2011 18:12:05 +0000 (11:12 -0700)]
HLK75C
Vladimir Chtchetkine [Wed, 21 Sep 2011 14:01:34 +0000 (07:01 -0700)]
Packages media_profiles.xml file into emulated system image
The file is required by the camera framework to properly set it up to work with
emulated camera devices.
Change-Id: I39686841030d21ef23775972aa4ee0ecd7a91c02
The Android Automerger [Wed, 21 Sep 2011 13:32:26 +0000 (06:32 -0700)]
IFK83
The Android Automerger [Wed, 21 Sep 2011 13:28:22 +0000 (06:28 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
The Android Open Source Project [Wed, 21 Sep 2011 13:19:08 +0000 (06:19 -0700)]
Reconcile with gingerbread-release gingerbread-mr4-release honeycomb-LTE-release ics-factoryrom-release
Change-Id: Ia9e4bd8eeec153bd3ba21c06320b743e60127921
Doug Zongker [Mon, 19 Sep 2011 22:02:03 +0000 (15:02 -0700)]
build the sqlite3 binary for use by the OTA tools
Change-Id: I2c6cc02dec74fdcedd3e2a6f3ddb1dfba657a883
The Android Automerger [Wed, 21 Sep 2011 04:18:52 +0000 (21:18 -0700)]
HLK75B
The Android Automerger [Wed, 21 Sep 2011 03:46:35 +0000 (20:46 -0700)]
IFK81D
The Android Automerger [Wed, 21 Sep 2011 03:43:27 +0000 (20:43 -0700)]
IFK82D
The Android Automerger [Wed, 21 Sep 2011 03:42:59 +0000 (20:42 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
Ying Wang [Wed, 21 Sep 2011 03:04:50 +0000 (20:04 -0700)]
am
04c48584: Merge "Fix OVERRIDE_BUILT_MODULE_PATH for prebuilt shared libraries." into ics-factoryrom
* commit '
04c485843f9fce0f66d18cb96e1051b7382b1f38':
Fix OVERRIDE_BUILT_MODULE_PATH for prebuilt shared libraries.
Ying Wang [Wed, 21 Sep 2011 03:02:27 +0000 (20:02 -0700)]
Merge "Install path support for vendor modules."
Ying Wang [Wed, 21 Sep 2011 03:02:17 +0000 (20:02 -0700)]
Merge "Fix OVERRIDE_BUILT_MODULE_PATH for prebuilt shared libraries." into ics-factoryrom
The Android Automerger [Tue, 20 Sep 2011 23:42:11 +0000 (16:42 -0700)]
IFK82C
The Android Automerger [Tue, 20 Sep 2011 23:24:59 +0000 (16:24 -0700)]
IFK82B
The Android Automerger [Tue, 20 Sep 2011 18:15:16 +0000 (11:15 -0700)]
GWK74C
Change-Id: If8b5d46a73e3f3fd27f331fea1a60850253db68e
The Android Automerger [Tue, 20 Sep 2011 17:57:35 +0000 (10:57 -0700)]
GWK74B
Change-Id: Iac19525df3d9f5bfe7d70cb5e09746685fadf81a
android-merger [Tue, 20 Sep 2011 17:14:08 +0000 (10:14 -0700)]
GRK39F
Change-Id: Ie0e9c74d30bf06939943bc0c0bbd9ba4fe589de0
Doug Zongker [Tue, 20 Sep 2011 16:31:54 +0000 (09:31 -0700)]
am
7094bf3a: am
25863d73: build the sqlite3 binary for use by the OTA tools
* commit '
7094bf3a5e9d1983d6877f580506d93fd736c437':
build the sqlite3 binary for use by the OTA tools
Doug Zongker [Tue, 20 Sep 2011 16:27:07 +0000 (09:27 -0700)]
am
25863d73: build the sqlite3 binary for use by the OTA tools
* commit '
25863d738ca171015a57a2154ff6ebe4ae8f5483':
build the sqlite3 binary for use by the OTA tools
Jean-Baptiste Queru [Tue, 20 Sep 2011 14:38:26 +0000 (07:38 -0700)]
Reconcile with ics-factoryrom-release
Change-Id: I9223944a4645008cefa5b73e4a551f73a84aba3f
The Android Automerger [Tue, 20 Sep 2011 13:30:19 +0000 (06:30 -0700)]
IFK82
The Android Automerger [Tue, 20 Sep 2011 13:26:52 +0000 (06:26 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
The Android Automerger [Tue, 20 Sep 2011 04:54:35 +0000 (21:54 -0700)]
IFK81C
Doug Zongker [Mon, 19 Sep 2011 22:02:03 +0000 (15:02 -0700)]
build the sqlite3 binary for use by the OTA tools
Change-Id: I2c6cc02dec74fdcedd3e2a6f3ddb1dfba657a883
The Android Automerger [Mon, 19 Sep 2011 23:39:02 +0000 (16:39 -0700)]
IFK81B
Raphael [Mon, 19 Sep 2011 22:47:04 +0000 (15:47 -0700)]
am
514c487d: (-s ours) Enable building sdk/avdlauncher in the Win SDK. DO NOT MERGE.
* commit '
514c487dcb0f0a3ef800305bbf75c0773f1e4966':
Enable building sdk/avdlauncher in the Win SDK. DO NOT MERGE.
Raphael [Mon, 19 Sep 2011 22:47:03 +0000 (15:47 -0700)]
am
77fed269: (-s ours) Don\'t strip llvm-rs-rc in core/Makefile. DO NOT MERGE.
* commit '
77fed26921ed7c083fc3f176e19b1f1d78ef80f1':
Don't strip llvm-rs-rc in core/Makefile. DO NOT MERGE.
Raphael [Mon, 19 Sep 2011 22:46:58 +0000 (15:46 -0700)]
am
131292c0: (-s ours) Add rm and strip abilities to atree. DO NOT MERGE.
* commit '
131292c0422b4e6eca5ee0eda431c9faae5cf35d':
Add rm and strip abilities to atree. DO NOT MERGE.
Dianne Hackborn [Mon, 19 Sep 2011 00:34:29 +0000 (17:34 -0700)]
New LOCAL_SDK_RES_VERSION config var.
This allows an app to target a different SDK level for its resources
than it uses for its Java code. This is useful because it is generally
safe to use various newer symbols like attribute names, as older versions
of the platform will simply ignore them.
Change-Id: Ida19ec9f259c4ea70de846e9a63546e263b1c91e
The Android Open Source Project [Mon, 19 Sep 2011 15:00:33 +0000 (08:00 -0700)]
Reconcile with ics-factoryrom-release
Change-Id: I849876516cfa315f96ac984b52fc6dc21e053577
The Android Automerger [Mon, 19 Sep 2011 13:29:30 +0000 (06:29 -0700)]
IFK81
The Android Automerger [Mon, 19 Sep 2011 13:27:07 +0000 (06:27 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
The Android Automerger [Mon, 19 Sep 2011 03:47:20 +0000 (20:47 -0700)]
IFK80D
The Android Automerger [Mon, 19 Sep 2011 02:30:25 +0000 (19:30 -0700)]
IFK80C
The Android Automerger [Sun, 18 Sep 2011 22:26:05 +0000 (15:26 -0700)]
IFK80B
The Android Automerger [Sun, 18 Sep 2011 13:30:47 +0000 (06:30 -0700)]
IFK80
The Android Automerger [Sun, 18 Sep 2011 13:27:16 +0000 (06:27 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
The Android Automerger [Sat, 17 Sep 2011 15:17:40 +0000 (08:17 -0700)]
IFK77E
Raphael [Fri, 16 Sep 2011 15:59:13 +0000 (08:59 -0700)]
Enable building sdk/avdlauncher in the Win SDK. DO NOT MERGE.
Required by Change-Id Ic651e3c3 in sdk.git
Cherry-pick from master
c36df7b12bb5e1e97e39c3576d330af37536b02d
Change-Id: Ic51ad7df01ce1bc926ba69f8a031a060edbf0bd1
Raphael [Thu, 15 Sep 2011 18:21:08 +0000 (11:21 -0700)]
Don't strip llvm-rs-rc in core/Makefile. DO NOT MERGE.
This is done in development/build/sdk.atree now.
Cherry-pick from master
469bbdf8c37a74e236d129faeaa5483838af9028
Raphael [Wed, 14 Sep 2011 22:07:05 +0000 (15:07 -0700)]
Add rm and strip abilities to atree. DO NOT MERGE.
The new line syntax is:
[SRC] [rm|strip] DEST
This allows one to write things like this in atree:
bin/src
bin/src bin/dest
bin/src "bin/another file name"
rm dest/file
rm dest/dir # recursive
strip bin/src
bin/src strip bin/dest
Src and dest can contain spaces if full enclosed in double-quotes.
The strip command can be overridden using the STRIP env var.
Cherry-pick from master
0b3ec5d32f15bdea67d15af95cf68e455867c668
The Android Automerger [Sat, 17 Sep 2011 00:18:03 +0000 (17:18 -0700)]
IFK77D
The Android Open Source Project [Fri, 16 Sep 2011 19:52:53 +0000 (12:52 -0700)]
Reconcile with ics-factoryrom-release
Change-Id: I95804a1a46496e2ba9336831eaeac9ae58d12d17
Raphael [Fri, 16 Sep 2011 19:25:07 +0000 (12:25 -0700)]
Merge "Don't strip llvm-rs-rc in core/Makefile"
Raphael [Fri, 16 Sep 2011 17:59:41 +0000 (10:59 -0700)]
Merge "Enable building sdk/avdlauncher in the Win SDK."
Raphael [Fri, 16 Sep 2011 15:59:13 +0000 (08:59 -0700)]
Enable building sdk/avdlauncher in the Win SDK.
Required by Change-Id Ic651e3c3 in sdk.git
Change-Id: I97f389d052ba9abf1c40547abbc6d7c164bdf405
Raphael [Fri, 16 Sep 2011 16:11:58 +0000 (09:11 -0700)]
Merge "Add rm and strip abilities to atree."
The Android Automerger [Fri, 16 Sep 2011 00:55:40 +0000 (17:55 -0700)]
IFK77C
Ying Wang [Thu, 15 Sep 2011 19:00:52 +0000 (12:00 -0700)]
Fix OVERRIDE_BUILT_MODULE_PATH for prebuilt shared libraries.
So that prebuilt shared libraries can be referenced with the module name
in other module's Android.mk.
Change-Id: I4c4b471696642694b805b71dd7605b91724ad924
The Android Automerger [Thu, 15 Sep 2011 21:36:27 +0000 (14:36 -0700)]
IFK77B
Ying Wang [Thu, 15 Sep 2011 20:50:52 +0000 (13:50 -0700)]
Use LOCAL_REQUIRED_MODULES to add dependency of installed shared libraries
Bug:
5200343
Before this change the build system assumes that shared libraries will
be installed to $(TARGET_SHARED_LIBRARIES). That's not true if the
module uses custom LOCAL_MODULE_PATH.
With this change we defer the evaluation of the dependency to after all
Android.mks are loaded and all modules have their installed path
determined.
Change-Id: Ib6628ed44154a90e8668d31691fbbac67125be6c
Raphael [Thu, 15 Sep 2011 18:21:08 +0000 (11:21 -0700)]
Don't strip llvm-rs-rc in core/Makefile
This is done in development/build/sdk.atree now.
Change-Id: I2cd8e42192439851e1e42070cf74e6ee7c02ba59
Raphael [Wed, 14 Sep 2011 22:07:05 +0000 (15:07 -0700)]
Add rm and strip abilities to atree.
The new line syntax is:
[SRC] [rm|strip] DEST
This allows one to write things like this in atree:
bin/src
bin/src bin/dest
bin/src "bin/another file name"
rm dest/file
rm dest/dir # recursive
strip bin/src
bin/src strip bin/dest
Src and dest can contain spaces if full enclosed in double-quotes.
The strip command can be overridden using the STRIP env var.
Change-Id: I22aae7a87c36c082e1aab87132099a3c644914da
Ed Heyl [Thu, 15 Sep 2011 16:44:04 +0000 (09:44 -0700)]
correct branch id to 'IF'
Change-Id: I7fd338f355511869559cc5b407b82e77dc3425ed
Ed Heyl [Thu, 15 Sep 2011 14:00:42 +0000 (07:00 -0700)]
IPK77
Change-Id: I3bc35f1705a33b34119a350b84ff54dc19a89da3
Ed Heyl [Thu, 15 Sep 2011 13:49:04 +0000 (06:49 -0700)]
Ed Heyl [Thu, 15 Sep 2011 11:54:20 +0000 (04:54 -0700)]
default version
Change-Id: I6ca2be74916b5bebffd910fdbcbefe158fdfc562
Dianne Hackborn [Wed, 14 Sep 2011 18:03:40 +0000 (11:03 -0700)]
Hello, Android 4.0.
Change-Id: I0d775bc81e1fb1c3ca0151b15a582035109dc5b5
The Android Open Source Project [Wed, 14 Sep 2011 14:22:41 +0000 (07:22 -0700)]
Reconcile with gingerbread-release gingerbread-mr4-release honeycomb-LTE-release
Change-Id: Icc3dd8b424542fd5cef9de4768b9c344e7e6381f