OSDN Git Service
Ying Wang [Mon, 23 Aug 2010 20:52:18 +0000 (13:52 -0700)]
am
ffff0028: Pass pagesize to makebootimage.
Merge commit '
ffff0028ae9a83893f71efa370d283e2247bcdd4' into gingerbread-plus-aosp
* commit '
ffff0028ae9a83893f71efa370d283e2247bcdd4':
Pass pagesize to makebootimage.
Ying Wang [Mon, 23 Aug 2010 19:56:25 +0000 (12:56 -0700)]
Pass pagesize to makebootimage.
Change-Id: I719d765245469921de105430fdd92d478ea48e82
Ying Wang [Mon, 23 Aug 2010 18:49:10 +0000 (11:49 -0700)]
am
065521be: Backport ext4 support from master [DO NOT MERGE]
Merge commit '
065521be4fd6965058fbd599bb43fe13101fee7c' into gingerbread-plus-aosp
* commit '
065521be4fd6965058fbd599bb43fe13101fee7c':
Backport ext4 support from master [DO NOT MERGE]
Ying Wang [Mon, 23 Aug 2010 18:34:40 +0000 (11:34 -0700)]
Backport ext4 support from master [DO NOT MERGE]
ext4 support is needed by crespo.
Change-Id: I604cb9ada526ce8ba6b3648171ac1d614a5519a9
Ying Wang [Sun, 22 Aug 2010 00:00:59 +0000 (17:00 -0700)]
am
ad3cf5f8: Restore OTA for crespo. [DO NOT MERGE]
Merge commit '
ad3cf5f868fc36de0a4fa501f074d35a94496b27' into gingerbread-plus-aosp
* commit '
ad3cf5f868fc36de0a4fa501f074d35a94496b27':
Restore OTA for crespo. [DO NOT MERGE]
Ying Wang [Sat, 21 Aug 2010 23:49:07 +0000 (16:49 -0700)]
Restore OTA for crespo. [DO NOT MERGE]
Change-Id: I2472942741bdb2e4fa5037883f6acbe6c4ca36c3
Jean-Baptiste Queru [Sat, 21 Aug 2010 02:22:51 +0000 (19:22 -0700)]
am
60d1ee3e: Better way to disable OTAs for crespo - DO NOT MERGE
Merge commit '
60d1ee3e539e02ba701b9ff647fd23aca18f890d' into gingerbread-plus-aosp
* commit '
60d1ee3e539e02ba701b9ff647fd23aca18f890d':
Better way to disable OTAs for crespo - DO NOT MERGE
Jean-Baptiste Queru [Sat, 21 Aug 2010 02:19:00 +0000 (19:19 -0700)]
Better way to disable OTAs for crespo - DO NOT MERGE
OTAs need to be disabled for all products using crespo
hardware, not just a single one.
Change-Id: I961462e5e87bec8c59dafa13dbf0fdc96bab29ab
Ying Wang [Sat, 21 Aug 2010 00:13:56 +0000 (17:13 -0700)]
am
7daa9132: Disable OTA for crespo [DO NOT MERGE]
Merge commit '
7daa91323139fa7c0435a07b0e3fad6056d0954b' into gingerbread-plus-aosp
* commit '
7daa91323139fa7c0435a07b0e3fad6056d0954b':
Disable OTA for crespo [DO NOT MERGE]
Ying Wang [Fri, 20 Aug 2010 23:45:19 +0000 (16:45 -0700)]
Disable OTA for crespo [DO NOT MERGE]
Change-Id: I22c29226bb783fed34766e91d43edcf6e61a837f
android-build SharedAccount [Wed, 18 Aug 2010 20:38:19 +0000 (13:38 -0700)]
am
c434bbbb: am
817a8ac9: (-s ours) bump version from 2.2 to 2.2.1 for next froyo release
Merge commit '
c434bbbb2c8453f581e0b993ecf23949ca7c5f9b' into gingerbread-plus-aosp
* commit '
c434bbbb2c8453f581e0b993ecf23949ca7c5f9b':
bump version from 2.2 to 2.2.1 for next froyo release
android-build SharedAccount [Wed, 18 Aug 2010 15:45:04 +0000 (08:45 -0700)]
am
817a8ac9: (-s ours) bump version from 2.2 to 2.2.1 for next froyo release
Merge commit '
817a8ac99392228f894d18ea40b0fb4c1b6ca8fe' into gingerbread
* commit '
817a8ac99392228f894d18ea40b0fb4c1b6ca8fe':
bump version from 2.2 to 2.2.1 for next froyo release
android-build SharedAccount [Wed, 18 Aug 2010 05:44:17 +0000 (22:44 -0700)]
bump version from 2.2 to 2.2.1 for next froyo release
Change-Id: Ic636f111d4a7a69954539bbd480b7119bf0d730f
Raphael Moll [Tue, 17 Aug 2010 14:48:46 +0000 (07:48 -0700)]
am
ddeb150d: Add easymock for list of Windows SDK targets.
Merge commit '
ddeb150d8d300806de576430444bf1a84ff35e96' into gingerbread-plus-aosp
* commit '
ddeb150d8d300806de576430444bf1a84ff35e96':
Add easymock for list of Windows SDK targets.
Raphael Moll [Mon, 16 Aug 2010 18:12:53 +0000 (11:12 -0700)]
Add easymock for list of Windows SDK targets.
Also correctly sorted the windows sdk target list.
Change-Id: I4742a0b98ece8e0693a6f346a1f09595253d65c1
Jean-Baptiste Queru [Mon, 16 Aug 2010 15:15:24 +0000 (08:15 -0700)]
am
43d406e5: Merge "add drm/ directory to include it as part of frameworks"
Merge commit '
43d406e5c633af505de0e05e44fda9cfe781c184' into gingerbread-plus-aosp
* commit '
43d406e5c633af505de0e05e44fda9cfe781c184':
add drm/ directory to include it as part of frameworks
Jean-Baptiste Queru [Mon, 16 Aug 2010 15:08:48 +0000 (08:08 -0700)]
Merge "add drm/ directory to include it as part of frameworks"
Hung-ying Tyan [Wed, 11 Aug 2010 00:50:28 +0000 (17:50 -0700)]
am
ddefdef5: Make ProGuard keep necessary members for serializable classes
Merge commit '
ddefdef5bc560d95f799993759c22ddc02e61b49' into gingerbread-plus-aosp
* commit '
ddefdef5bc560d95f799993759c22ddc02e61b49':
Make ProGuard keep necessary members for serializable classes
Hung-ying Tyan [Tue, 10 Aug 2010 09:50:25 +0000 (17:50 +0800)]
Make ProGuard keep necessary members for serializable classes
Change-Id: I845eb8280d0cab7e426b17c94d74bc409e66c193
Chung-yih Wang [Fri, 6 Aug 2010 02:37:54 +0000 (19:37 -0700)]
am
1a2649f0: Merge "Add voip(SIP related codes) into framework." into gingerbread
Merge commit '
1a2649f0da35218748db5aa02c9969246a714b8f' into gingerbread-plus-aosp
* commit '
1a2649f0da35218748db5aa02c9969246a714b8f':
Add voip(SIP related codes) into framework.
Chung-yih Wang [Fri, 6 Aug 2010 02:35:35 +0000 (19:35 -0700)]
Merge "Add voip(SIP related codes) into framework." into gingerbread
Scott Main [Thu, 5 Aug 2010 22:18:06 +0000 (15:18 -0700)]
am
6eea9363: am
4f2436dc: update carousel icon for nexus one dev phone
Merge commit '
6eea9363f4aeaa861f2e021ea3c9494cb49a83b6' into gingerbread-plus-aosp
* commit '
6eea9363f4aeaa861f2e021ea3c9494cb49a83b6':
update carousel icon for nexus one dev phone
Scott Main [Thu, 5 Aug 2010 22:18:03 +0000 (15:18 -0700)]
am
be4696e0: am
7589398c: Merge "Doc change: Add nexus one to dev phones image." into froyo
Merge commit '
be4696e073b93e0e65f767e77166a08efd67c6cb' into gingerbread-plus-aosp
* commit '
be4696e073b93e0e65f767e77166a08efd67c6cb':
Doc change: Add nexus one to dev phones image.
Scott Main [Thu, 5 Aug 2010 22:10:05 +0000 (15:10 -0700)]
am
4f2436dc: update carousel icon for nexus one dev phone
Merge commit '
4f2436dc3513f671935811bfa0c7e6c2c15505be' into gingerbread
* commit '
4f2436dc3513f671935811bfa0c7e6c2c15505be':
update carousel icon for nexus one dev phone
Scott Main [Thu, 5 Aug 2010 22:10:03 +0000 (15:10 -0700)]
am
7589398c: Merge "Doc change: Add nexus one to dev phones image." into froyo
Merge commit '
7589398cf9127987a768ccfb3dbb9cde54d00f02' into gingerbread
* commit '
7589398cf9127987a768ccfb3dbb9cde54d00f02':
Doc change: Add nexus one to dev phones image.
Brian Carlstrom [Thu, 5 Aug 2010 17:40:23 +0000 (10:40 -0700)]
am
7dc35a3b: Tracking merge of dalvik-dev to gingerbread
Merge commit '
7dc35a3b9c7fe7e6aaacc8e11dca9ca94f4b4ff0' into gingerbread-plus-aosp
* commit '
7dc35a3b9c7fe7e6aaacc8e11dca9ca94f4b4ff0':
Tracking merge of dalvik-dev to gingerbread
Scott Main [Thu, 5 Aug 2010 16:44:47 +0000 (09:44 -0700)]
update carousel icon for nexus one dev phone
Change-Id: I7f92063a7dc6b49dd6bb044b79931dbc9268ebd6
Scott Main [Thu, 5 Aug 2010 15:05:37 +0000 (08:05 -0700)]
Merge "Doc change: Add nexus one to dev phones image." into froyo
Brian Carlstrom [Thu, 5 Aug 2010 06:17:47 +0000 (23:17 -0700)]
Tracking merge of dalvik-dev to gingerbread
git cherry-pick --no-commit
f2f3e4b2
git cherry-pick --no-commit
b6a08f0cd36b12054ac73992a2737ea294387116
git cherry-pick --no-commit
d05d74b2d6f717ee25ca14c913ea7610c030ecd1
git cherry-pick --no-commit
5479d77e320420ef0cd7250d1a6729839ef907ce
Change-Id: I6f339aa73823e053146719b3af7af91d5375df1c
Chung-yih Wang [Thu, 5 Aug 2010 03:31:07 +0000 (11:31 +0800)]
Add voip(SIP related codes) into framework.
Change-Id: I12bbeb3dacd51b0234872529479e61bdd8536629
Ying Wang [Thu, 29 Jul 2010 17:30:13 +0000 (10:30 -0700)]
am
e1f37ba0: am
55edb20e: Merge "Dist apkcerts.txt for unbundled builds" into froyo
Merge commit '
e1f37ba0cfb0bcd8c463d0d85ccbbbbec4cc5bc4' into gingerbread-plus-aosp
* commit '
e1f37ba0cfb0bcd8c463d0d85ccbbbbec4cc5bc4':
Dist apkcerts.txt for unbundled builds
Ying Wang [Thu, 29 Jul 2010 17:27:45 +0000 (10:27 -0700)]
am
55edb20e: Merge "Dist apkcerts.txt for unbundled builds" into froyo
Merge commit '
55edb20e246e88afd841f63725c647132d9aca17' into gingerbread
* commit '
55edb20e246e88afd841f63725c647132d9aca17':
Dist apkcerts.txt for unbundled builds
Ying Wang [Thu, 29 Jul 2010 17:21:15 +0000 (10:21 -0700)]
Merge "Dist apkcerts.txt for unbundled builds" into froyo
Xavier Ducrohet [Wed, 28 Jul 2010 22:14:51 +0000 (15:14 -0700)]
am
e743c53b: Package ddmlib-prebuilt with CTS.
Merge commit '
e743c53b88faf35be47667b0252c881c7b32f856' into gingerbread-plus-aosp
* commit '
e743c53b88faf35be47667b0252c881c7b32f856':
Package ddmlib-prebuilt with CTS.
The Android Open Source Project [Wed, 28 Jul 2010 18:47:24 +0000 (11:47 -0700)]
The Android Open Source Project [Wed, 28 Jul 2010 18:35:24 +0000 (11:35 -0700)]
The Android Open Source Project [Wed, 28 Jul 2010 18:24:38 +0000 (11:24 -0700)]
merge from open-source froyo
Change-Id: I947332f4e978326309fe14d01875ebfe94405c9f
Xavier Ducrohet [Wed, 28 Jul 2010 18:07:31 +0000 (11:07 -0700)]
Package ddmlib-prebuilt with CTS.
This ensures that CTS is using a compatible ddmlib.
Change-Id: Iff6d2bfec873949dfd07ccf758bf257350f11298
The Android Open Source Project [Wed, 28 Jul 2010 17:40:27 +0000 (10:40 -0700)]
reconcile forked froyos
Change-Id: Ie0ab94638cc4489d9644e17d26f0603578a011e7
aimitakeshi [Mon, 26 Jul 2010 23:34:47 +0000 (08:34 +0900)]
add drm/ directory to include it as part of frameworks
Change-Id: I62a6ab77587d88ea960f9ece17dcb75726e7e5a9
The Android Open Source Project [Mon, 26 Jul 2010 19:25:52 +0000 (12:25 -0700)]
am
989fade3: am
af44485f: merge from open-source froyo
Merge commit '
989fade304ef5253b5b401f347e26f768d75f35f' into gingerbread-plus-aosp
* commit '
989fade304ef5253b5b401f347e26f768d75f35f':
Include Test Case List from CTS Project
The Android Open Source Project [Mon, 26 Jul 2010 19:06:35 +0000 (12:06 -0700)]
am
af44485f: merge from open-source froyo
Merge commit '
af44485fe83bb36a9d55fb54a8f5362854dd7b10' into gingerbread
* commit '
af44485fe83bb36a9d55fb54a8f5362854dd7b10':
Include Test Case List from CTS Project
The Android Open Source Project [Mon, 26 Jul 2010 19:02:01 +0000 (12:02 -0700)]
merge from open-source froyo
Change-Id: I6bac03b1f646ea171ee20f0e90d37f337d7987fa
Evan Charlton [Mon, 26 Jul 2010 15:53:19 +0000 (08:53 -0700)]
resolved conflicts for merge of
f2bfa76c to gingerbread-plus-aosp
Change-Id: I67b9af3ef344cfa7502f780d82c1a3d8a1a33f6d
Ying Wang [Fri, 23 Jul 2010 23:42:13 +0000 (16:42 -0700)]
Dist apkcerts.txt for unbundled builds
Change-Id: Ic381d846f020dc43f48f43581c0db5721f2e36f7
Dirk Dougherty [Fri, 23 Jul 2010 21:00:22 +0000 (14:00 -0700)]
Doc change: Add nexus one to dev phones image.
Change-Id: I39541b208ed4a2f7b7f48c42f37f3ccdfc05de02
Evan Charlton [Fri, 23 Jul 2010 19:21:48 +0000 (12:21 -0700)]
resolved conflicts for merge of
121a7873 to gingerbread
Change-Id: I7b5cecd4236f263c31d4af73d929ff6b5729089e
Jean-Baptiste Queru [Fri, 23 Jul 2010 18:36:58 +0000 (11:36 -0700)]
am
8339ba91: Merge "Replaced AlarmClock with DeskClock"
Merge commit '
8339ba912d2932a1caad24a3977ddeca0c549c48' into gingerbread-plus-aosp
* commit '
8339ba912d2932a1caad24a3977ddeca0c549c48':
Replaced AlarmClock with DeskClock
Jean-Baptiste Queru [Fri, 23 Jul 2010 18:25:51 +0000 (11:25 -0700)]
Merge "Replaced AlarmClock with DeskClock"
Christian Mehlmauer [Fri, 23 Jul 2010 18:09:54 +0000 (20:09 +0200)]
Replaced AlarmClock with DeskClock
Change-Id: I1a9b9ce79b5b16709fe2d89638285633801b6d24
Evan Charlton [Fri, 23 Jul 2010 18:03:29 +0000 (11:03 -0700)]
Packages can specify where to find AndroidManifest.xml
By overriding LOCAL_MANIFEST_FILE, a package can now specify which
AndroidManifest.xml file to use. This also allows for AndroidManifest.xml to
be in a non-standard location, though that's not recommended.
Change-Id: Ib6d1baeef7601e5a93d4ce64d18883d45373fc12
Ying Wang [Fri, 23 Jul 2010 00:52:01 +0000 (17:52 -0700)]
am
ef5bf469: am
bce4b75f: Add JNI_H_INCLUDE as default header search path
Merge commit '
ef5bf469fab7166373b10db6c88e6c3cf0e64217' into gingerbread-plus-aosp
* commit '
ef5bf469fab7166373b10db6c88e6c3cf0e64217':
Add JNI_H_INCLUDE as default header search path
Ying Wang [Fri, 23 Jul 2010 00:49:13 +0000 (17:49 -0700)]
am
bce4b75f: Add JNI_H_INCLUDE as default header search path
Merge commit '
bce4b75fa7801fcb88c6a9ade9465806fe18d441' into gingerbread
* commit '
bce4b75fa7801fcb88c6a9ade9465806fe18d441':
Add JNI_H_INCLUDE as default header search path
Ying Wang [Thu, 22 Jul 2010 22:51:56 +0000 (15:51 -0700)]
Add JNI_H_INCLUDE as default header search path
So that module Android.mk does not need to include it manually.
Also with this change, CL like https://android-git.corp.google.com/g/57887 is not needed.
Change-Id: I68fa73a00c76eb37a8142f35d7eeef79cf53c09b
Brian Muramatsu [Thu, 22 Jul 2010 21:46:53 +0000 (14:46 -0700)]
Include Test Case List from CTS Project
Bug
2732160
Have the cts.mk include the test case list from CTS rather
than defining it in cts.mk. This permits CTS developers to
add new packages and applications without having to submit
multiple project changes to both the CTS and build projects
everytime.
Change-Id: I63d90ac4f5d9fc9a9aa0ff79a8bf9dfb1a79c822
The Android Open Source Project [Thu, 22 Jul 2010 18:31:59 +0000 (11:31 -0700)]
merge from open-source master
Change-Id: Ide7fbe06d7f9c1a06827365f006ddc7a01ba4dab
Ying Wang [Thu, 22 Jul 2010 18:06:26 +0000 (11:06 -0700)]
am
d9dea715: am
d5c217ac: Merge "add phony target "all_modules" and use it as make goal for "mm"/"mmm"" into froyo
Merge commit '
d9dea715e5841028b1a30aa3f357b05c9de3e8c7' into gingerbread-plus-aosp
* commit '
d9dea715e5841028b1a30aa3f357b05c9de3e8c7':
add phony target "all_modules" and use it as make goal for "mm"/"mmm"
Ying Wang [Thu, 22 Jul 2010 18:06:23 +0000 (11:06 -0700)]
am
ebf93bb5: am
75b28573: Fix sim build for unbundling native code
Merge commit '
ebf93bb5c4585e783813ed5fcc54fc02b80ea460' into gingerbread-plus-aosp
* commit '
ebf93bb5c4585e783813ed5fcc54fc02b80ea460':
Fix sim build for unbundling native code
Ying Wang [Thu, 22 Jul 2010 17:58:14 +0000 (10:58 -0700)]
am
d5c217ac: Merge "add phony target "all_modules" and use it as make goal for "mm"/"mmm"" into froyo
Merge commit '
d5c217aca18726f0ed9f2ea034f750620d4bdf7d' into gingerbread
* commit '
d5c217aca18726f0ed9f2ea034f750620d4bdf7d':
add phony target "all_modules" and use it as make goal for "mm"/"mmm"
Ying Wang [Thu, 22 Jul 2010 17:58:12 +0000 (10:58 -0700)]
am
75b28573: Fix sim build for unbundling native code
Merge commit '
75b28573fe739a10f0f91fab1ef916ddd1c0b91c' into gingerbread
* commit '
75b28573fe739a10f0f91fab1ef916ddd1c0b91c':
Fix sim build for unbundling native code
Ying Wang [Thu, 22 Jul 2010 17:51:03 +0000 (10:51 -0700)]
Merge "add phony target "all_modules" and use it as make goal for "mm"/"mmm"" into froyo
Ying Wang [Tue, 20 Jul 2010 23:18:16 +0000 (16:18 -0700)]
add phony target "all_modules" and use it as make goal for "mm"/"mmm"
So that mm/mmm don't depend on phony target "files", which brings in
unwanted files for apps-only build.
Also allow "dist" for mmm.
Bug: http://b/issue?id=
2811503
Change-Id: I2c0794aebd1d171d8a0f44eb8cda67855704d6bd
Jeffrey Chyan [Wed, 7 Jul 2010 18:42:19 +0000 (13:42 -0500)]
Allow explicit warnings for projects
Enabled compiler warnings by default and then modified javac
command to include warnings only if a project's warning flag,
LOCAL_WARNINGS_ENABLE, is set to true.
Change-Id: I5111d16a862f3afaaf1dcba2f2c2b7fc072613f1
The Android Open Source Project [Fri, 16 Jul 2010 20:03:44 +0000 (13:03 -0700)]
merge from open-source master
Change-Id: Ib0c0f02bb8fc87c3221fd9d2387a46b579a8ce40
Ying Wang [Fri, 16 Jul 2010 18:34:36 +0000 (11:34 -0700)]
Fix sim build for unbundling native code
NDK does not support sim build.
Change-Id: I57a09c0083126c57a99cf33c055edef3390d1c28
Joe Onorato [Fri, 16 Jul 2010 00:05:21 +0000 (17:05 -0700)]
am
b1c272a6: Do a full clean build because of the installclean improvement steps
Merge commit '
b1c272a670936322db5200d888ea8558eb266d6e' into gingerbread-plus-aosp
* commit '
b1c272a670936322db5200d888ea8558eb266d6e':
Do a full clean build because of the installclean improvement steps
Joe Onorato [Fri, 16 Jul 2010 00:02:25 +0000 (17:02 -0700)]
Do a full clean build because of the installclean improvement steps
Change-Id: I8f8ec00667374cd1f5adad6ea4d737dac79be47f
Scott Main [Thu, 15 Jul 2010 23:46:26 +0000 (16:46 -0700)]
am
81f42236: am
9269a711: docs: ensure code-ified links in qv are the proper color
Merge commit '
81f42236e2971caac9354686d7acbe40f3fe0f4e' into gingerbread-plus-aosp
* commit '
81f42236e2971caac9354686d7acbe40f3fe0f4e':
docs: ensure code-ified links in qv are the proper color
Scott Main [Thu, 15 Jul 2010 23:43:38 +0000 (16:43 -0700)]
am
9269a711: docs: ensure code-ified links in qv are the proper color
Merge commit '
9269a711753f2523acd3fe5ae661559f754a1bd0' into gingerbread
* commit '
9269a711753f2523acd3fe5ae661559f754a1bd0':
docs: ensure code-ified links in qv are the proper color
Jean-Baptiste Queru [Thu, 15 Jul 2010 21:04:39 +0000 (14:04 -0700)]
Add full_x86 product.
By inheriting from full, this will be more self-maintaining, and
automatically gets a better-configured variant (e.g. it has locales,
a date format, etc...).
Change-Id: I67b6c2d9f9b7d20cb89154906c3f3d6a5391c838
Scott Main [Fri, 25 Jun 2010 23:09:24 +0000 (16:09 -0700)]
docs: ensure code-ified links in qv are the proper color
Change-Id: I61dd859e0749573746c9bfcbf224758463370ba7
Joe Onorato [Thu, 15 Jul 2010 18:10:32 +0000 (11:10 -0700)]
am
e2c62252: Merge "Instrumentation links against the jar file for its app, so use that at the dependency." into gingerbread
Merge commit '
e2c622524116b49d5817fedf1d88e2bb1521a9ec' into gingerbread-plus-aosp
* commit '
e2c622524116b49d5817fedf1d88e2bb1521a9ec':
Instrumentation links against the jar file for its app, so use that at the dependency.
Joe Onorato [Thu, 15 Jul 2010 18:10:29 +0000 (11:10 -0700)]
am
d7324cc3: Merge "Fix event-log-tags so we don\'t rebuild framework.jar because of an installclean." into gingerbread
Merge commit '
d7324cc356e9c67d878d156ca81928ab2ef220f5' into gingerbread-plus-aosp
* commit '
d7324cc356e9c67d878d156ca81928ab2ef220f5':
Fix event-log-tags so we don't rebuild framework.jar because of an installclean.
Joe Onorato [Thu, 15 Jul 2010 18:10:26 +0000 (11:10 -0700)]
am
2198ff81: Merge "The ICU data is no longer compiled directly into the shared library." into gingerbread
Merge commit '
2198ff81b98941e905f7e39616f5ca15effb5704' into gingerbread-plus-aosp
* commit '
2198ff81b98941e905f7e39616f5ca15effb5704':
The ICU data is no longer compiled directly into the shared library.
Joe Onorato [Thu, 15 Jul 2010 18:07:42 +0000 (11:07 -0700)]
Merge "Instrumentation links against the jar file for its app, so use that at the dependency." into gingerbread
Joe Onorato [Thu, 15 Jul 2010 18:07:35 +0000 (11:07 -0700)]
Merge "Fix event-log-tags so we don't rebuild framework.jar because of an installclean." into gingerbread
Joe Onorato [Thu, 15 Jul 2010 18:07:30 +0000 (11:07 -0700)]
Merge "The ICU data is no longer compiled directly into the shared library." into gingerbread
Joe Onorato [Thu, 15 Jul 2010 02:49:05 +0000 (19:49 -0700)]
Instrumentation links against the jar file for its app, so use that at the dependency.
I don't remember exactly, but I think the dependencies for apps
were broken, and you couldn't reliably cause the java to be rebuilt
by depending just on the jar file-- you needed to depend on the
apk. That isn't the case anymore, and relying on the apk means
that something built in out/target/common was depending on something
that's deleted by installclean.
With this change (and others), on my mac, the build after
installclean for passion-eng takes 2 minutes instead of 11.
Change-Id: Ib490f88292d591254013e07958961fc50ec2e3dc
Mathias Agopian [Wed, 14 Jul 2010 23:36:14 +0000 (16:36 -0700)]
am
9967e9db: Merge "add an entry for the new libgui" into gingerbread
Merge commit '
9967e9dbb82e982db67fcfc5412055f26b8721b4' into gingerbread-plus-aosp
* commit '
9967e9dbb82e982db67fcfc5412055f26b8721b4':
add an entry for the new libgui
Mathias Agopian [Wed, 14 Jul 2010 23:31:43 +0000 (16:31 -0700)]
Merge "add an entry for the new libgui" into gingerbread
Jean-Baptiste Queru [Wed, 14 Jul 2010 18:32:07 +0000 (11:32 -0700)]
am
07523a19: am
a0cb4666: Merge "merge from open-source froyo" into froyo
Merge commit '
07523a191de568aba9753d4d12d1fe392feea497' into gingerbread-plus-aosp
* commit '
07523a191de568aba9753d4d12d1fe392feea497':
Build Accessibility Tests and APK
Jean-Baptiste Queru [Wed, 14 Jul 2010 18:29:08 +0000 (11:29 -0700)]
am
a0cb4666: Merge "merge from open-source froyo" into froyo
Merge commit '
a0cb466645ccc88d4f6d1f83018d5a0daf2eec6a' into gingerbread
* commit '
a0cb466645ccc88d4f6d1f83018d5a0daf2eec6a':
Build Accessibility Tests and APK
Jean-Baptiste Queru [Wed, 14 Jul 2010 18:06:23 +0000 (11:06 -0700)]
Merge "merge from open-source froyo" into froyo
Joe Onorato [Wed, 14 Jul 2010 17:22:54 +0000 (10:22 -0700)]
Fix event-log-tags so we don't rebuild framework.jar because of an installclean.
Produce an event logs tag file for everything we know about, in order
to properly allocate numbers. Then produce a file that's filtered
for what's going to be installed.
Change-Id: Id0778aec0b4d045e8ff91ba2c9c8265e860eaba5
Mathias Agopian [Wed, 14 Jul 2010 05:26:21 +0000 (22:26 -0700)]
add an entry for the new libgui
libgui is for high level C++ frameworks, it can depend on the
binder (unlike libui).
Change-Id: I4a1ebc69284919c85dce03e1395578af2fd08aa8
Joe Onorato [Wed, 14 Jul 2010 02:05:37 +0000 (19:05 -0700)]
The ICU data is no longer compiled directly into the shared library.
Change-Id: I79accedc16d6e62a95c0ec6f08ad2538013cd0b3
Ying Wang [Wed, 14 Jul 2010 02:02:25 +0000 (19:02 -0700)]
am
a9b02f0b: resolved conflicts for merge of
a6bed2f7 to gingerbread
Merge commit '
a9b02f0bfeba5b3df1d6e74e7a695c5d357f2a13' into gingerbread-plus-aosp
* commit '
a9b02f0bfeba5b3df1d6e74e7a695c5d357f2a13':
Add phony target dist_libraries
Ying Wang [Wed, 14 Jul 2010 01:59:56 +0000 (18:59 -0700)]
resolved conflicts for merge of
a6bed2f7 to gingerbread
Change-Id: Ic9efcc70af22f15a1bb136f70a30db59dc629e03
Ying Wang [Wed, 14 Jul 2010 01:50:05 +0000 (18:50 -0700)]
Merge "Add phony target dist_libraries" into froyo
Ying Wang [Wed, 14 Jul 2010 00:48:40 +0000 (17:48 -0700)]
am
90b1d3dc: am
b6a1c180: Keep the crt start/end var name of sh consistent with other archs
Merge commit '
90b1d3dcfece8eef53277cbcf0326deda9f16f09' into gingerbread-plus-aosp
* commit '
90b1d3dcfece8eef53277cbcf0326deda9f16f09':
Keep the crt start/end var name of sh consistent with other archs
Ying Wang [Wed, 14 Jul 2010 00:46:29 +0000 (17:46 -0700)]
am
b6a1c180: Keep the crt start/end var name of sh consistent with other archs
Merge commit '
b6a1c1802961f40fe4736e80402f849968cd2563' into gingerbread
* commit '
b6a1c1802961f40fe4736e80402f849968cd2563':
Keep the crt start/end var name of sh consistent with other archs
Ying Wang [Wed, 14 Jul 2010 00:41:14 +0000 (17:41 -0700)]
Keep the crt start/end var name of sh consistent with other archs
So that the PRIVATE_ vars get values correctly.
Change-Id: I1eea67f02c5bab5018b3b5fd93904e1ee8643bf7
Ying Wang [Wed, 14 Jul 2010 00:24:09 +0000 (17:24 -0700)]
am
f0f60cdd: resolved conflicts for merge of
1a08100f to gingerbread
Merge commit '
f0f60cdd8f4f74b2480774887606afdebec8d891' into gingerbread-plus-aosp
* commit '
f0f60cdd8f4f74b2480774887606afdebec8d891':
Support to build native libraries with prebuilt NDK
Ying Wang [Wed, 14 Jul 2010 00:21:33 +0000 (17:21 -0700)]
resolved conflicts for merge of
1a08100f to gingerbread
Change-Id: I9e4183a1d5c0efb13de8655b9eb7c74d50b34cd7
Ying Wang [Tue, 13 Jul 2010 21:55:47 +0000 (14:55 -0700)]
Support to build native libraries with prebuilt NDK
Bug: http://b/issue?id=
2811253
Change-Id: Iabd4ab8b3d7236dffe89f1939e1142e882944026
The Android Open Source Project [Tue, 13 Jul 2010 22:24:07 +0000 (15:24 -0700)]
merge from open-source froyo
Change-Id: I2759c464efef13754154310d10816a5781243311
The Android Open Source Project [Mon, 12 Jul 2010 22:01:01 +0000 (15:01 -0700)]
merge from open-source master
Change-Id: I333595755ed96c753b3f01ef6715a230eee94e0d
The Android Open Source Project [Mon, 12 Jul 2010 21:58:14 +0000 (14:58 -0700)]
merge from open-source master
Change-Id: I9363020bdd32d8ff984a3945a2aab6245cf7a3c4
The Android Open Source Project [Mon, 12 Jul 2010 21:55:52 +0000 (14:55 -0700)]
merge from open-source master
Change-Id: I0221f3903a2fc6a0fb25ae62913fdc2e9d3c3f4f
The Android Open Source Project [Mon, 12 Jul 2010 21:46:37 +0000 (14:46 -0700)]
merge from open-source master
Change-Id: I412376856ebbcec786181c7a9d3b4af4ef52c7a6