OSDN Git Service
Ben Dodson [Tue, 17 Aug 2010 18:31:33 +0000 (11:31 -0700)]
Merge "Removed unused source files. Apicheck and droiddoc are now in external/doclava."
Ben Dodson [Tue, 17 Aug 2010 16:52:09 +0000 (09:52 -0700)]
Removed unused source files. Apicheck and droiddoc are now in external/doclava.
Change-Id: I13bcdbd27214e15235fa9687b6f15f8853f5f448
Raphael Moll [Tue, 17 Aug 2010 14:51:31 +0000 (07:51 -0700)]
am
ddf08caa: am
ddeb150d: Add easymock for list of Windows SDK targets.
Merge commit '
ddf08caafa9644a502c0804450b9b6572010eb0d'
* commit '
ddf08caafa9644a502c0804450b9b6572010eb0d':
Add easymock for list of Windows SDK targets.
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.
Jean-Baptiste Queru [Mon, 16 Aug 2010 22:18:51 +0000 (15:18 -0700)]
am
4a6e7d7c: am
43d406e5: Merge "add drm/ directory to include it as part of frameworks"
Merge commit '
4a6e7d7c49fa91a3c26b091d2ac653f4feeb003f'
* commit '
4a6e7d7c49fa91a3c26b091d2ac653f4feeb003f':
add drm/ directory to include it as part of frameworks
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"
Hristo Bojinov [Thu, 12 Aug 2010 18:44:49 +0000 (11:44 -0700)]
Merge "Increase the Retouch buffer size."
Ben Murdoch [Thu, 12 Aug 2010 11:45:27 +0000 (12:45 +0100)]
Increase the Retouch buffer size.
New WebKit merge built with JSC javascript engine triggers the
overflow.
Change-Id: I71a9bbc9b27c9a0e7f3680f20be2696f61c3b266
Ben Dodson [Wed, 11 Aug 2010 21:08:28 +0000 (14:08 -0700)]
Fix for heap size in apicheck
Change-Id: Id2efffef3e81464994c3788d1d0bc69c60bc6456
Ben Dodson [Wed, 11 Aug 2010 16:27:04 +0000 (09:27 -0700)]
Merge "Use doclava for apicheck"
Hung-ying Tyan [Wed, 11 Aug 2010 00:54:32 +0000 (17:54 -0700)]
am
d81e9f88: am
ddefdef5: Make ProGuard keep necessary members for serializable classes
Merge commit '
d81e9f88f4576dd8b18143f0a0d5f50c3758202b'
* commit '
d81e9f88f4576dd8b18143f0a0d5f50c3758202b':
Make ProGuard keep necessary members for serializable classes
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
Ben Dodson [Tue, 10 Aug 2010 23:01:23 +0000 (16:01 -0700)]
Use doclava for apicheck
Change-Id: I6a84717cf645e2a27cea9271c444d159c82439c5
Jean-Baptiste Queru [Mon, 9 Aug 2010 23:42:14 +0000 (16:42 -0700)]
Use all known locales in full build
Also use more audio files
Change-Id: Iab42123239c30012b0d918b5a4b484b5fc878faf
Ben Dodson [Fri, 6 Aug 2010 17:09:46 +0000 (10:09 -0700)]
Merge "Migrating to Doclava for documentation generation; 60% speed improvement when building with -nodocs, no more JNI dependence. Output consistency verified with Meld diff tool. See code.google.com/p/doclava"
Chung-yih Wang [Fri, 6 Aug 2010 02:43:45 +0000 (10:43 +0800)]
resolved conflicts for merge of
9b7ebf5d to master
Change-Id: I0dfbc70b4b52a69ba43f14def4203ece8d9c9090
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
Dima Zavin [Fri, 6 Aug 2010 00:46:47 +0000 (17:46 -0700)]
core: fix paths to libm arch-specific include dirs
Change-Id: I17a1ed13af6d4955a636ad429917b683ac59a947
Signed-off-by: Dima Zavin <dima@android.com>
Ben Dodson [Thu, 5 Aug 2010 22:42:37 +0000 (15:42 -0700)]
Migrating to Doclava for documentation generation; 60% speed improvement when building with -nodocs, no more JNI dependence. Output consistency verified with Meld diff tool. See code.google.com/p/doclava
Change-Id: If317bd108043b152d28babc88a7c949db5127a93
Scott Main [Thu, 5 Aug 2010 22:25:15 +0000 (15:25 -0700)]
am
240782f2: am
6eea9363: am
4f2436dc: update carousel icon for nexus one dev phone
Merge commit '
240782f2bdc804fb5635a4bb7fbcfb104d48ddb3'
* commit '
240782f2bdc804fb5635a4bb7fbcfb104d48ddb3':
update carousel icon for nexus one dev phone
Scott Main [Thu, 5 Aug 2010 22:25:12 +0000 (15:25 -0700)]
am
b7256fd6: am
be4696e0: am
7589398c: Merge "Doc change: Add nexus one to dev phones image." into froyo
Merge commit '
b7256fd6851d90c088b8cc1603fa62faa95714de'
* commit '
b7256fd6851d90c088b8cc1603fa62faa95714de':
Doc change: Add nexus one to dev phones image.
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.
Ying Wang [Thu, 5 Aug 2010 21:14:46 +0000 (14:14 -0700)]
Merge "Now slang supports multiple rs files in a single run."
Ying Wang [Sat, 31 Jul 2010 01:37:29 +0000 (18:37 -0700)]
Now slang supports multiple rs files in a single run.
Change-Id: I26be766614ee3542d76471e3fc55f485ac65bdee
Brian Carlstrom [Thu, 5 Aug 2010 19:13:01 +0000 (12:13 -0700)]
am
f9be4330: am
7dc35a3b: Tracking merge of dalvik-dev to gingerbread
Merge commit '
f9be43305a74fc1c8123cb4eb5c74347acce8a13'
* commit '
f9be43305a74fc1c8123cb4eb5c74347acce8a13':
Tracking merge of dalvik-dev to gingerbread
Thomas Tuttle [Thu, 5 Aug 2010 18:49:14 +0000 (11:49 -0700)]
libublock: Remove from prelink-linux-arm.map (no longer prelinked)
Change-Id: I0415c138e7c05f08bfca7de250fbdbced3e3ab79
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
Thomas Tuttle [Thu, 5 Aug 2010 00:42:28 +0000 (17:42 -0700)]
libublock: Add to prelink-linux-arm.map
Change-Id: Ie9a4ef8650f22a5146b3a0f0dc049f46199075e9
Colin Cross [Wed, 4 Aug 2010 05:51:49 +0000 (22:51 -0700)]
Disable CheckSize on ext partitions to fix build
Change-Id: I66c67f8bbd84eb9da988b4079ad4c36089c1c930
Colin Cross [Wed, 4 Aug 2010 01:46:06 +0000 (18:46 -0700)]
Merge "Pass partition size to mkuserimg.sh"
Colin Cross [Wed, 4 Aug 2010 01:45:58 +0000 (18:45 -0700)]
Merge changes I81e84ca0,I6e3a6ba3
* changes:
Pass partition sizes to make_ext4fs
Add dependencies on make_ext4fs
Ying Wang [Wed, 4 Aug 2010 01:05:25 +0000 (18:05 -0700)]
Pass partition size to mkuserimg.sh
Change-Id: Id6a53d8d552e8ce1bdf83fbb756724454e05e5c8
Colin Cross [Tue, 3 Aug 2010 21:43:34 +0000 (14:43 -0700)]
Pass partition sizes to make_ext4fs
Change-Id: I81e84ca02e4326989d25f7d43306c56cdc39348c
Colin Cross [Tue, 3 Aug 2010 21:43:15 +0000 (14:43 -0700)]
Add dependencies on make_ext4fs
Change-Id: I6e3a6ba33fd9e0ce35137f6e2f60d01521af4cb9
Jeff Davidson [Mon, 2 Aug 2010 17:00:44 +0000 (10:00 -0700)]
Add tab completion for lunch.
Change-Id: I4ddfffe8fe4519665a5a66aa60990f900a9ba80a
Jing Yu [Tue, 3 Aug 2010 03:32:42 +0000 (20:32 -0700)]
Merge "Make arm-linux-androideabi toolchain the default for Android build."
Hristo Bojinov [Mon, 2 Aug 2010 17:26:17 +0000 (10:26 -0700)]
Working ASLR implementation.
ASLR for shared libraries is controlled by "-a" in ota_from_target_files.
Binary files are self-contained (supported by apriori/soslim).
Signed-off-by: Hristo Bojinov <hristo@google.com>
Change-Id: I500e325bf4a70a8d69a2ab9b2938e83dadb4e65d
Jing Yu [Thu, 29 Jul 2010 22:07:31 +0000 (15:07 -0700)]
Make arm-linux-androideabi toolchain the default for Android build.
androideabi target is already in upstream GCC. The arm-linux-
androideabi toolchain can be built directly from upstream GCC.
Switching from old special tailored arm-eabi toolchain to the new
arm-linux-androideabi toolchain make us closer to the opensource
community and friendly to all toolchain developers.
kernel still uses arm-eabi toolchain. So we add arm-eabi toolchain
path to PATH.
The arm-linux-androideabi-4.4.x toolchain is built with the same
source as the latest arm-eabi-4.4.3 toolchain except for the
target change patches.
Change-Id: I1e5f2fe2faeee08f913f37e0ba93e84d2654a8ff
Ying Wang [Thu, 29 Jul 2010 17:32:19 +0000 (10:32 -0700)]
am
33c11ac3: am
e1f37ba0: am
55edb20e: Merge "Dist apkcerts.txt for unbundled builds" into froyo
Merge commit '
33c11ac3f150a388ebf2df80a42b577c136282de'
* commit '
33c11ac3f150a388ebf2df80a42b577c136282de':
Dist apkcerts.txt for unbundled builds
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:17:09 +0000 (15:17 -0700)]
am
45270759: am
e743c53b: Package ddmlib-prebuilt with CTS.
Merge commit '
45270759642c03bdbe39ae261e22160d2c64ecec'
* commit '
45270759642c03bdbe39ae261e22160d2c64ecec':
Package ddmlib-prebuilt with CTS.
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.
Jing Yu [Wed, 28 Jul 2010 21:47:15 +0000 (14:47 -0700)]
Merge "Group needed libraries together to solve the cyclic dependence between libc, libc_nomalloc and libgcc. When building with upcoming arm-linux-androideabi toolchain, Symbol raise is needed by libgcc.a and defined by libc.a or libc_nomalloc.a.which."
The Android Open Source Project [Wed, 28 Jul 2010 18:48:46 +0000 (11:48 -0700)]
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
Dianne Hackborn [Sun, 25 Jul 2010 01:13:13 +0000 (18:13 -0700)]
Change version codename.
Change-Id: I0bee8d54cf50448f53133eaae64bc0e57781d4ed
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
Ying Wang [Mon, 26 Jul 2010 23:25:55 +0000 (16:25 -0700)]
Add $(LOCAL_MODULE) as part of the installed path.
Change-Id: If691e263f157aa0d123c0e3fe3c9698bbbf58c96
The Android Open Source Project [Mon, 26 Jul 2010 19:31:21 +0000 (12:31 -0700)]
am
4e8e998e: am
989fade3: am
af44485f: merge from open-source froyo
Merge commit '
4e8e998ecc2bf8b3971d62963c09b558ca6d5da4'
* commit '
4e8e998ecc2bf8b3971d62963c09b558ca6d5da4':
Include Test Case List from CTS Project
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 17:31:25 +0000 (10:31 -0700)]
am
606540b7: resolved conflicts for merge of
f2bfa76c to gingerbread-plus-aosp
Merge commit '
606540b739599c8f079baa2a03b5f0501b148eb2'
* commit '
606540b739599c8f079baa2a03b5f0501b148eb2':
Packages can specify where to find AndroidManifest.xml
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:40:09 +0000 (11:40 -0700)]
am
44d62854: am
8339ba91: Merge "Replaced AlarmClock with DeskClock"
Merge commit '
44d628540c248f026bf2f26e8d9c3a17cb52b2b4'
* commit '
44d628540c248f026bf2f26e8d9c3a17cb52b2b4':
Replaced AlarmClock with DeskClock
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
Xavier Ducrohet [Fri, 23 Jul 2010 01:36:53 +0000 (18:36 -0700)]
Merge "Add SystemUi to the SDK build."
Xavier Ducrohet [Fri, 23 Jul 2010 01:31:10 +0000 (18:31 -0700)]
Add SystemUi to the SDK build.
Change-Id: I84eb98c0b3fdaeb9e06c934ea5f4bdcf078cb7f1
Ying Wang [Fri, 23 Jul 2010 00:54:45 +0000 (17:54 -0700)]
am
3986feae: am
ef5bf469: am
bce4b75f: Add JNI_H_INCLUDE as default header search path
Merge commit '
3986feae3266a86f0eb4d20fe97588868608b4c1'
* commit '
3986feae3266a86f0eb4d20fe97588868608b4c1':
Add JNI_H_INCLUDE as default header search path
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:35:13 +0000 (11:35 -0700)]
am
85581a1b: merge from open-source master
Merge commit '
85581a1ba81105740cc1e87bfad040bbac4662ec'
* commit '
85581a1ba81105740cc1e87bfad040bbac4662ec':
Allow explicit warnings for projects
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:24:38 +0000 (11:24 -0700)]
am
b96e8a8c: am
d9dea715: am
d5c217ac: Merge "add phony target "all_modules" and use it as make goal for "mm"/"mmm"" into froyo
Merge commit '
b96e8a8cc629c3e3a196263cc548bd55824e4ade'
* commit '
b96e8a8cc629c3e3a196263cc548bd55824e4ade':
add phony target "all_modules" and use it as make goal for "mm"/"mmm"
Ying Wang [Thu, 22 Jul 2010 18:24:31 +0000 (11:24 -0700)]
am
163ce0f6: am
ebf93bb5: am
75b28573: Fix sim build for unbundling native code
Merge commit '
163ce0f62f7992d2c79257965919fcc1d975a6ec'
* commit '
163ce0f62f7992d2c79257965919fcc1d975a6ec':
Fix sim build for unbundling native code
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 [Thu, 22 Jul 2010 00:11:26 +0000 (17:11 -0700)]
Merge "Fix native test static lib."
Ying Wang [Wed, 21 Jul 2010 23:18:21 +0000 (16:18 -0700)]
Fix native test static lib.
Change-Id: I2ef5a4c913732a9a3211556493926f4883b4160e
Ying Wang [Wed, 21 Jul 2010 21:58:42 +0000 (14:58 -0700)]
Trim spaces.
Change-Id: Ic3c592ca9457748acf7f2c5e99dccd3ed62f5ee4
Jing Yu [Thu, 20 May 2010 19:00:54 +0000 (12:00 -0700)]
Group needed libraries together to solve the cyclic dependence
between libc, libc_nomalloc and libgcc. When building with upcoming
arm-linux-androideabi toolchain, Symbol raise is needed by libgcc.a
and defined by libc.a or libc_nomalloc.a.which.
This patch groups libgc.a, libc_nomalloc.a and libgcc.a together, which is
a minimal group to solve this problem.
Change-Id: I27ed78c495dc53c1db7b302da8704f5e478ad893
Ying Wang [Wed, 21 Jul 2010 20:44:00 +0000 (13:44 -0700)]
Merge "Allow PRODUCT_PROPERTY_OVERRIDES to override default locale."
OSDN Git Service
