OSDN Git Service
Ying Wang [Mon, 27 Sep 2010 21:59:13 +0000 (14:59 -0700)]
am
30090e41: Set the intermediate dirs before using them.
Merge commit '
30090e41e31e7db34a1092d8173c1413c036b49d' into gingerbread-plus-aosp
* commit '
30090e41e31e7db34a1092d8173c1413c036b49d':
Set the intermediate dirs before using them.
Ying Wang [Mon, 27 Sep 2010 21:53:39 +0000 (14:53 -0700)]
Set the intermediate dirs before using them.
Change-Id: Ibdab1234ca8c5a86c5226ed71e84374c3fcd7a90
Ying Wang [Mon, 27 Sep 2010 21:10:53 +0000 (14:10 -0700)]
am
9049e321: Add javalib.dex.jar to LOCAL_INTERMEDIATE_TARGETS
Merge commit '
9049e321aec53cfb23b63bbee7c21878a087350f' into gingerbread-plus-aosp
* commit '
9049e321aec53cfb23b63bbee7c21878a087350f':
Add javalib.dex.jar to LOCAL_INTERMEDIATE_TARGETS
Ying Wang [Mon, 27 Sep 2010 21:07:17 +0000 (14:07 -0700)]
Add javalib.dex.jar to LOCAL_INTERMEDIATE_TARGETS
So the its target-specific PRIVATE vars can be set properly.
Change-Id: I83b60bd56ee8523b0ba97092010c76c270b60c02
Ying Wang [Mon, 27 Sep 2010 18:52:45 +0000 (11:52 -0700)]
am
02352378: Remove emulator-based dexpreopt logic from the build system.
Merge commit '
0235237805991b48831dc8add072a50c478b2fcb' into gingerbread-plus-aosp
* commit '
0235237805991b48831dc8add072a50c478b2fcb':
Remove emulator-based dexpreopt logic from the build system.
Ying Wang [Mon, 27 Sep 2010 17:37:25 +0000 (10:37 -0700)]
Remove emulator-based dexpreopt logic from the build system.
Change-Id: Ic96cbd1ebb9fa65aa85bf77f18a31913625d7e1c
Jean-Baptiste Queru [Mon, 27 Sep 2010 00:39:11 +0000 (17:39 -0700)]
am
97984c41: reconcile froyo-release into gingerbread
Merge commit '
97984c41fe4f8fdca1f24c7bf790bf03b174f90e' into gingerbread-plus-aosp
* commit '
97984c41fe4f8fdca1f24c7bf790bf03b174f90e':
FRG83
FRG78
FRG75
FRG58B
FRG58
FRG57
include build timestamp in OTA metadata
Jean-Baptiste Queru [Mon, 27 Sep 2010 00:28:49 +0000 (17:28 -0700)]
reconcile froyo-release into gingerbread
Change-Id: If6c3b341b0716ef4f80721da2635b7bde45f453d
Doug Zongker [Sun, 26 Sep 2010 22:09:54 +0000 (15:09 -0700)]
am
96a57e73: make info_dict and GetTypeAndDevice available to device extensions
Merge commit '
96a57e737707d05333dced5b657c4ef21c44088a' into gingerbread-plus-aosp
* commit '
96a57e737707d05333dced5b657c4ef21c44088a':
make info_dict and GetTypeAndDevice available to device extensions
Doug Zongker [Sun, 26 Sep 2010 21:57:41 +0000 (14:57 -0700)]
make info_dict and GetTypeAndDevice available to device extensions
Change-Id: I3aa04cb6d7988fc1fdd7f179634b09ceab5749fb
Ying Wang [Sun, 26 Sep 2010 20:47:45 +0000 (13:47 -0700)]
am
1448b0b7: Remove emulator-based dexpreopt code
Merge commit '
1448b0b7023a43ff4461cc66d25230c9b6502724' into gingerbread-plus-aosp
* commit '
1448b0b7023a43ff4461cc66d25230c9b6502724':
Remove emulator-based dexpreopt code
Ying Wang [Sun, 26 Sep 2010 20:11:16 +0000 (13:11 -0700)]
Remove emulator-based dexpreopt code
Now dexpreopt is done on the host side.
Change-Id: I1ea1a5d1fac2531028e017364ef870abb7420be7
Ying Wang [Sat, 25 Sep 2010 01:12:12 +0000 (18:12 -0700)]
am
d56d69b6: Merge "Fix dependency when switching between build variants with and without Proguard." into gingerbread
Merge commit '
d56d69b621bf41b478d59b6f987b6f796a9d8652' into gingerbread-plus-aosp
* commit '
d56d69b621bf41b478d59b6f987b6f796a9d8652':
Fix dependency when switching between build variants with and without Proguard.
Ying Wang [Sat, 25 Sep 2010 01:08:30 +0000 (18:08 -0700)]
Merge "Fix dependency when switching between build variants with and without Proguard." into gingerbread
Ying Wang [Fri, 24 Sep 2010 21:00:50 +0000 (14:00 -0700)]
am
19f9c1c2: Fix nothing-to-do build.
Merge commit '
19f9c1c243262aa3c16cba026a82ad53aa2818ac' into gingerbread-plus-aosp
* commit '
19f9c1c243262aa3c16cba026a82ad53aa2818ac':
Fix nothing-to-do build.
Ying Wang [Fri, 24 Sep 2010 20:56:45 +0000 (13:56 -0700)]
Fix nothing-to-do build.
Because .odex is always newer than the .jar file, so we should use "|" depdendency here.
Change-Id: Ied4c5ec4ee3294862c0a232f96c15cca2c748e11
Andy McFadden [Fri, 24 Sep 2010 19:33:50 +0000 (12:33 -0700)]
am
6474811d: Fix sim-eng build.
Merge commit '
6474811d646153aeab111c1c0586b6ee53dcb0d2' into gingerbread-plus-aosp
* commit '
6474811d646153aeab111c1c0586b6ee53dcb0d2':
Fix sim-eng build.
Andy McFadden [Fri, 24 Sep 2010 19:04:17 +0000 (12:04 -0700)]
Fix sim-eng build.
Don't try to do the host build if we're configured for sim-eng. They
seem to be clashing, and it's redundant anyway.
Change-Id: I8e1a24b6e07d28701b32b6559ba39337b211264d
Ficus Kirkpatrick [Fri, 24 Sep 2010 18:09:40 +0000 (11:09 -0700)]
am
e7f8140e: am
7978d50e: Add a workaround for a platform JAR parsing bug.
Merge commit '
e7f8140e6df19840a6f2c4bc7063cc6c484b140f' into gingerbread-plus-aosp
* commit '
e7f8140e6df19840a6f2c4bc7063cc6c484b140f':
Add a workaround for a platform JAR parsing bug.
Ficus Kirkpatrick [Fri, 24 Sep 2010 17:58:04 +0000 (10:58 -0700)]
am
7978d50e: Add a workaround for a platform JAR parsing bug.
Merge commit '
7978d50edb9c4da0b8f4076412f092418da6e372' into gingerbread
* commit '
7978d50edb9c4da0b8f4076412f092418da6e372':
Add a workaround for a platform JAR parsing bug.
Ficus Kirkpatrick [Fri, 24 Sep 2010 05:57:05 +0000 (22:57 -0700)]
Add a workaround for a platform JAR parsing bug.
The java.util.jar implementation through Android 1.6 has a
bug where if the signature file in META-INF is a multiple
of 1024 bytes, it will throw an IOException attempting to
read it.
If signapk would produce a CERT.SF in a multiple of 1024
bytes, add an extra CRLF to the end of the file.
Bug:
3019677
Change-Id: I23d4a36e12e224be600d3ac39379b5b5a022a628
Ying Wang [Fri, 24 Sep 2010 01:05:38 +0000 (18:05 -0700)]
am
02c9813a: Prebuilt NDKs are merged for linux and darwin.
Merge commit '
02c9813a726803e1c406b19f6b9dc4e411326e66' into gingerbread-plus-aosp
* commit '
02c9813a726803e1c406b19f6b9dc4e411326e66':
Prebuilt NDKs are merged for linux and darwin.
Ying Wang [Fri, 24 Sep 2010 00:59:36 +0000 (17:59 -0700)]
Prebuilt NDKs are merged for linux and darwin.
Change-Id: I0b632d7ba4df5b27dda36280b22dfd0b37e116b7
Ying Wang [Thu, 23 Sep 2010 18:48:38 +0000 (11:48 -0700)]
Fix dependency when switching between build variants with and without Proguard.
With this change, in a user build the dependency looks like:
package.apk -> progaurd.classes.dex -> ... -> proguard.classes.jar
While in an eng build:
package.apk -> noproguard.classes.dex -> ... -> noproguard.classes.jar
Because package.apk is product-specific and removed when switching between
user and eng builds, it can always be built with the correct and up-to-date .dex file.
Bug:
3022484
Change-Id: I3a732cb3e256f193088c294dc4a0573188283cb2
Ying Wang [Thu, 23 Sep 2010 23:42:38 +0000 (16:42 -0700)]
am
50d7d7a0: Fix private vars for host-dex rules.
Merge commit '
50d7d7a0a68378d1b02b5d2a2514592ba0d65f84' into gingerbread-plus-aosp
* commit '
50d7d7a0a68378d1b02b5d2a2514592ba0d65f84':
Fix private vars for host-dex rules.
Ying Wang [Thu, 23 Sep 2010 23:29:53 +0000 (16:29 -0700)]
Fix private vars for host-dex rules.
Change-Id: Ie374d3abf4c261b9c5e8b80ed464b4c6b1b52b42
Dmitry Shmidt [Thu, 23 Sep 2010 18:34:33 +0000 (11:34 -0700)]
am
fb148d31: Merge "user_tags: Remove 01-test target" into gingerbread
Merge commit '
fb148d31eaab585c377e3b6be7a5c94380d623e0' into gingerbread-plus-aosp
* commit '
fb148d31eaab585c377e3b6be7a5c94380d623e0':
user_tags: Remove 01-test target
Dmitry Shmidt [Thu, 23 Sep 2010 18:06:42 +0000 (11:06 -0700)]
Merge "user_tags: Remove 01-test target" into gingerbread
Ying Wang [Thu, 23 Sep 2010 00:34:05 +0000 (17:34 -0700)]
resolved conflicts for merge of
b368bba4 to gingerbread-plus-aosp
Change-Id: I50e3e45d2cd1d0a2c01f256e8f53ea4c8b2668c8
Ying Wang [Wed, 22 Sep 2010 23:57:01 +0000 (16:57 -0700)]
am
e7874c43: Integrate dexpreopt into the build system.
Merge commit '
e7874c430895b9a4e631c89f1e7729da9264d167' into gingerbread-plus-aosp
* commit '
e7874c430895b9a4e631c89f1e7729da9264d167':
Integrate dexpreopt into the build system.
Ying Wang [Fri, 17 Sep 2010 23:36:06 +0000 (16:36 -0700)]
Integrate dexpreopt into the build system.
Change-Id: Id67f85d0f5c8674f5bc22e431114ca73625811ef
Dmitry Shmidt [Wed, 22 Sep 2010 22:43:21 +0000 (15:43 -0700)]
user_tags: Remove 01-test target
Auto-merge: no
Change-Id: I5e573660cdb4696951bcf62b611cfa71bb8395db
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Ying Wang [Wed, 22 Sep 2010 20:14:49 +0000 (13:14 -0700)]
am
38a3161d: String literal change.
Merge commit '
38a3161dc7f5fec81df9412bc202c3962c74535d' into gingerbread-plus-aosp
* commit '
38a3161dc7f5fec81df9412bc202c3962c74535d':
String literal change.
Ying Wang [Wed, 22 Sep 2010 19:56:13 +0000 (12:56 -0700)]
String literal change.
Change-Id: Ic1289ee3abb184b4617aa42c28e6eca812600463
Jesse Wilson [Wed, 22 Sep 2010 18:55:29 +0000 (11:55 -0700)]
am
ce7d5023: Turn dalvikvm host builds on by default when linux is the host OS.
Merge commit '
ce7d5023c3df4c16ae395d64d51dd8345e40a39e' into gingerbread-plus-aosp
* commit '
ce7d5023c3df4c16ae395d64d51dd8345e40a39e':
Turn dalvikvm host builds on by default when linux is the host OS.
Jesse Wilson [Wed, 22 Sep 2010 17:59:10 +0000 (10:59 -0700)]
Turn dalvikvm host builds on by default when linux is the host OS.
Previously host builds were only enabled under user and user-debug
builds. This will make it easier for Androids to find out if they've
inadvertently broken host compatibility in native code.
Change-Id: Id1f2d5e189c4c1b6462fe03bab1b0f75e98a599c
Ying Wang [Thu, 8 Jul 2010 01:12:25 +0000 (18:12 -0700)]
Enforce 64-bit build environment
We will only support 64-bit build environment beyond froyo/2.2 .
Change-Id: I71eb1230bf0bc12ccde2aeda6255db6a87540437
Doug Zongker [Wed, 22 Sep 2010 17:18:33 +0000 (10:18 -0700)]
am
780c2372: accommodate both new and old target-files when creating incrementals (do not merge)
Merge commit '
780c2372706c5250079cb7d759f6530691dd9143' into gingerbread-plus-aosp
* commit '
780c2372706c5250079cb7d759f6530691dd9143':
accommodate both new and old target-files when creating incrementals (do not merge)
Doug Zongker [Wed, 22 Sep 2010 17:12:54 +0000 (10:12 -0700)]
accommodate both new and old target-files when creating incrementals (do not merge)
Change-Id: Ibc211164bf1dee8275e15d10cbe81b63d666069f
Doug Zongker [Wed, 22 Sep 2010 00:25:59 +0000 (17:25 -0700)]
am
ad806982: arg: system_size, not system_img
Merge commit '
ad806982c12b64d8dff040f5c9a444d810d7694c' into gingerbread-plus-aosp
* commit '
ad806982c12b64d8dff040f5c9a444d810d7694c':
arg: system_size, not system_img
Doug Zongker [Wed, 22 Sep 2010 00:22:14 +0000 (17:22 -0700)]
arg: system_size, not system_img
Change-Id: Iba5d10204c93159a4f12ea8e8d8687db5b9dd5ca
Brian Swetland [Tue, 21 Sep 2010 23:16:47 +0000 (16:16 -0700)]
am
c1a1aa1e: deal with gps renaming
Merge commit '
c1a1aa1eb5f2a6b9e45304b76da01802b5520c18' into gingerbread-plus-aosp
* commit '
c1a1aa1eb5f2a6b9e45304b76da01802b5520c18':
deal with gps renaming
Brian Swetland [Tue, 21 Sep 2010 22:58:12 +0000 (15:58 -0700)]
deal with gps renaming
Change-Id: I488de95880be1c4fadf23a2fb4f7e7eb686d52c2
Doug Zongker [Tue, 21 Sep 2010 21:37:19 +0000 (14:37 -0700)]
am
c0434ac8: add recovery.fstab as dependency so it triggers rebuild (do not merge)
Merge commit '
c0434ac8b504df8a2f2a2828dc9b3f804c3dda72' into gingerbread-plus-aosp
* commit '
c0434ac8b504df8a2f2a2828dc9b3f804c3dda72':
add recovery.fstab as dependency so it triggers rebuild (do not merge)
Doug Zongker [Tue, 21 Sep 2010 21:25:51 +0000 (14:25 -0700)]
add recovery.fstab as dependency so it triggers rebuild (do not merge)
Make recovery image depend on the fstab file so it gets rebuilt when
fstab changes. Add support for "emmc" fstab partition type to
edify_generator.
Change-Id: Ic5df4e86c24321bf7d82a644e3e4770352e4f64b
android-build SharedAccount [Tue, 21 Sep 2010 20:58:39 +0000 (13:58 -0700)]
FRG83
Change-Id: I8d8fa5700e05930be8550f536561498010725fb4
Doug Zongker [Tue, 21 Sep 2010 18:37:10 +0000 (11:37 -0700)]
am
258bf46e: support for per-partition fs_type (do not merge)
Merge commit '
258bf46ea6bb4f25d01fab1b783238589e5bbec4' into gingerbread-plus-aosp
* commit '
258bf46ea6bb4f25d01fab1b783238589e5bbec4':
support for per-partition fs_type (do not merge)
Doug Zongker [Tue, 21 Sep 2010 01:04:41 +0000 (18:04 -0700)]
support for per-partition fs_type (do not merge)
Include the recovery.fstab file in the recovery image. Remove the
global fs_type and partition_type values from the target-files
key/value dict, and parse the recovery.fstab file instead to find
types for each partition.
Change-Id: I35ee2dd0989441dc2a704b63c1b32e598049acb5
Steve Howard [Mon, 20 Sep 2010 18:52:57 +0000 (11:52 -0700)]
am
1020d271: Add new downloads UI to core build.
Merge commit '
1020d271c67b062e95b61c4eb9f1f5168e2b6197' into gingerbread-plus-aosp
* commit '
1020d271c67b062e95b61c4eb9f1f5168e2b6197':
Add new downloads UI to core build.
Steve Howard [Fri, 17 Sep 2010 01:15:02 +0000 (18:15 -0700)]
Add new downloads UI to core build.
Change-Id: I96a3bb10beb6c1ec9c48baa2e2039aab7c421b09
Joe Onorato [Sun, 19 Sep 2010 16:12:39 +0000 (09:12 -0700)]
am
ad05677b: Brian\'s vendor/ change requires a clean build.
Merge commit '
ad05677b0d02a54af34370e8b237aa86f0d627f4' into gingerbread-plus-aosp
* commit '
ad05677b0d02a54af34370e8b237aa86f0d627f4':
Brian's vendor/ change requires a clean build.
Joe Onorato [Sun, 19 Sep 2010 16:04:23 +0000 (12:04 -0400)]
Brian's vendor/ change requires a clean build.
Change-Id: I074fe1ec176dc005adcd79eaf7c91cc3b8d3f54c
Doug Zongker [Fri, 17 Sep 2010 14:48:28 +0000 (07:48 -0700)]
am
6be030af: Merge "remove remaining refs to max_image_sizes" into gingerbread
Merge commit '
6be030af2907cfbbfe59bd207e07f09c45ec4588' into gingerbread-plus-aosp
* commit '
6be030af2907cfbbfe59bd207e07f09c45ec4588':
remove remaining refs to max_image_sizes
Doug Zongker [Fri, 17 Sep 2010 14:46:07 +0000 (07:46 -0700)]
Merge "remove remaining refs to max_image_sizes" into gingerbread
Doug Zongker [Fri, 17 Sep 2010 14:44:38 +0000 (07:44 -0700)]
remove remaining refs to max_image_sizes
Change-Id: I7e4686bc06f9c3eab2df34d092021c549738b217
Brian Carlstrom [Fri, 17 Sep 2010 05:13:50 +0000 (22:13 -0700)]
am
c05d0000: Only turn host build on for linux
Merge commit '
c05d0000bb3e91a21c2cc7cbd85232f1afc7a8d2' into gingerbread-plus-aosp
* commit '
c05d0000bb3e91a21c2cc7cbd85232f1afc7a8d2':
Only turn host build on for linux
Brian Carlstrom [Fri, 17 Sep 2010 04:49:01 +0000 (21:49 -0700)]
Only turn host build on for linux
Change-Id: I595948b159bc6a2bf295fd11ab831f978e38c799
Doug Zongker [Fri, 17 Sep 2010 01:11:59 +0000 (18:11 -0700)]
am
918ccff3: Merge "consolidate target_files metadata into one key-value file" into gingerbread
Merge commit '
918ccff37260270d0eef3a3a7bfc2410c46d931a' into gingerbread-plus-aosp
* commit '
918ccff37260270d0eef3a3a7bfc2410c46d931a':
consolidate target_files metadata into one key-value file
Doug Zongker [Fri, 17 Sep 2010 01:09:23 +0000 (18:09 -0700)]
Merge "consolidate target_files metadata into one key-value file" into gingerbread
Jesse Wilson [Fri, 17 Sep 2010 00:48:29 +0000 (17:48 -0700)]
am
852f43bd: Include dalvik+libcore dependencies in core product definitions.
Merge commit '
852f43bd29da34ff15799b88c3db166428cea6d8' into gingerbread-plus-aosp
* commit '
852f43bd29da34ff15799b88c3db166428cea6d8':
Include dalvik+libcore dependencies in core product definitions.
Doug Zongker [Fri, 17 Sep 2010 00:44:38 +0000 (17:44 -0700)]
consolidate target_files metadata into one key-value file
Instead of separate files for recovery api version, tool extensions,
and mkyaffs2 options, put those all in the generic key-value file.
Change-Id: Ib642311632844d52e4895fd4747093fc7e86232d
Jesse Wilson [Thu, 16 Sep 2010 21:56:08 +0000 (14:56 -0700)]
Include dalvik+libcore dependencies in core product definitions.
Also conditionally include host-only dependencies when the host is
being built.
Change-Id: I0e8c9c1bef5ee60d4c1ce1c158f41b7642f9a8f2
android-build SharedAccount [Thu, 16 Sep 2010 21:04:48 +0000 (14:04 -0700)]
FRG78
Change-Id: I7de099f3c8650c05d70128313c3f46db5fcad2c0
Doug Zongker [Thu, 16 Sep 2010 20:04:07 +0000 (13:04 -0700)]
am
ec5ffbab: allow partition sizes in hex (when prefixed with 0x)
Merge commit '
ec5ffbabd3a3ba65bac934305f7ffcb7e15fb744' into gingerbread-plus-aosp
* commit '
ec5ffbabd3a3ba65bac934305f7ffcb7e15fb744':
allow partition sizes in hex (when prefixed with 0x)
Doug Zongker [Thu, 16 Sep 2010 20:01:26 +0000 (13:01 -0700)]
allow partition sizes in hex (when prefixed with 0x)
Change-Id: I806879fd496304c449ff5315b0ef48fd766d6428
Doug Zongker [Thu, 16 Sep 2010 19:32:56 +0000 (12:32 -0700)]
am
c77a9ad4: store user-visible image sizes in target-files
Merge commit '
c77a9ad444d49e2ad777678cf5671f0a94f44ffb' into gingerbread-plus-aosp
* commit '
c77a9ad444d49e2ad777678cf5671f0a94f44ffb':
store user-visible image sizes in target-files
Doug Zongker [Thu, 16 Sep 2010 18:28:43 +0000 (11:28 -0700)]
store user-visible image sizes in target-files
Do the yaffs-specific adjustments to image sizes in common.CheckSize,
instead of baking it into the image size stored in the target-files
package. Remove the special fs_type flag and fold it into the
"info_dict" we have for saving key-value pairs from the build system.
Change-Id: I6e63f3330f6277d9a946b22e66cadeb51203ba14
Doug Zongker [Thu, 16 Sep 2010 18:39:49 +0000 (11:39 -0700)]
am
8e8ff4ca: Merge "support for ext4/EMMC in target_files and OTA generation" into gingerbread
Merge commit '
8e8ff4cad905a5b4eed7659152f075f9a5c038b1' into gingerbread-plus-aosp
* commit '
8e8ff4cad905a5b4eed7659152f075f9a5c038b1':
support for ext4/EMMC in target_files and OTA generation
Doug Zongker [Thu, 16 Sep 2010 18:38:06 +0000 (11:38 -0700)]
Merge "support for ext4/EMMC in target_files and OTA generation" into gingerbread
Doug Zongker [Thu, 1 Jul 2010 22:30:11 +0000 (15:30 -0700)]
support for ext4/EMMC in target_files and OTA generation
Move the image sizes into a more generic key-value file. Make them
optional. Add additional key/value pairs describing what kind of
filesystem the device uses. Pass new fs-type-related arguments in
edify scripts when mounting and reformatting partitions.
Don't include all the init.*.rc files from the regular system in
recovery -- they aren't needed, and break recovery on some devices.
Change-Id: Ic1c651f754ed00ba1cffe8cf56c43f7f3b0ebfd7
Joe Onorato [Thu, 16 Sep 2010 18:22:22 +0000 (11:22 -0700)]
am
6022a978: Merge "DO NOT MERGE - These errors were missing from the list, which made it impossible to turn them off." into gingerbread
Merge commit '
6022a9786f745dc41f92e71e16b5b95a7cfd81b7' into gingerbread-plus-aosp
* commit '
6022a9786f745dc41f92e71e16b5b95a7cfd81b7':
DO NOT MERGE - These errors were missing from the list, which made it impossible to turn them off.
Joe Onorato [Thu, 16 Sep 2010 18:17:37 +0000 (11:17 -0700)]
Merge "DO NOT MERGE - These errors were missing from the list, which made it impossible to turn them off." into gingerbread
Joe Onorato [Thu, 16 Sep 2010 18:16:51 +0000 (14:16 -0400)]
DO NOT MERGE - These errors were missing from the list, which made it impossible to turn them off.
Change-Id: I94652bad7084f3868049b4ea0e43bb90f86dba6f
Ying Wang [Thu, 16 Sep 2010 17:59:41 +0000 (10:59 -0700)]
am
671f5fb0: Don\'t increase partition size for ext4 user images. [DO NOT MERGE]
Merge commit '
671f5fb09f3510c16f73049cad9d8d6d652eaad8' into gingerbread-plus-aosp
* commit '
671f5fb09f3510c16f73049cad9d8d6d652eaad8':
Don't increase partition size for ext4 user images. [DO NOT MERGE]
Ying Wang [Thu, 16 Sep 2010 17:54:03 +0000 (10:54 -0700)]
Don't increase partition size for ext4 user images. [DO NOT MERGE]
Change-Id: I5b82e6f7bd1c25ce3b1a4c16409b61aa1be7f71f
Joe Onorato [Thu, 16 Sep 2010 16:36:47 +0000 (09:36 -0700)]
am
27ce8811: DO NOT MERGE - Remove extra printf
Merge commit '
27ce8811835e9bbc9e230a618e883d30d0101c9e' into gingerbread-plus-aosp
* commit '
27ce8811835e9bbc9e230a618e883d30d0101c9e':
DO NOT MERGE - Remove extra printf
Joe Onorato [Thu, 16 Sep 2010 16:34:07 +0000 (12:34 -0400)]
DO NOT MERGE - Remove extra printf
Change-Id: I8a2e4fac78010fe531b080d3555557e557c038b9
Joe Onorato [Thu, 16 Sep 2010 16:27:31 +0000 (09:27 -0700)]
am
25ab3dcc: Merge "DO NOT MERGE - Add a -knowntags option to droiddoc" into gingerbread
Merge commit '
25ab3dcce40bc2d19eeb99c7b36eeab52e4fa582' into gingerbread-plus-aosp
* commit '
25ab3dcce40bc2d19eeb99c7b36eeab52e4fa582':
DO NOT MERGE - Add a -knowntags option to droiddoc
Joe Onorato [Thu, 16 Sep 2010 16:27:24 +0000 (09:27 -0700)]
am
9e59ec29: Merge "Allow LOCAL_ADDITIONAL_DEPENDENCIES for droiddoc modules." into gingerbread
Merge commit '
9e59ec29933a4e6e9ee740fd180e4e31ff687fae' into gingerbread-plus-aosp
* commit '
9e59ec29933a4e6e9ee740fd180e4e31ff687fae':
Allow LOCAL_ADDITIONAL_DEPENDENCIES for droiddoc modules.
Joe Onorato [Thu, 16 Sep 2010 16:02:54 +0000 (09:02 -0700)]
Merge "DO NOT MERGE - Add a -knowntags option to droiddoc" into gingerbread
Joe Onorato [Thu, 16 Sep 2010 16:02:17 +0000 (09:02 -0700)]
Merge "Allow LOCAL_ADDITIONAL_DEPENDENCIES for droiddoc modules." into gingerbread
Joe Onorato [Thu, 16 Sep 2010 15:57:42 +0000 (11:57 -0400)]
DO NOT MERGE - Add a -knowntags option to droiddoc
This lets us remove the special cases in Comment.java and specify additional
tags to not warn about for the big docs build.
Change-Id: I25ad651616f162919c56daa2d4bdf6333c9dd87d
Joe Onorato [Thu, 16 Sep 2010 15:57:19 +0000 (11:57 -0400)]
Allow LOCAL_ADDITIONAL_DEPENDENCIES for droiddoc modules.
Change-Id: I568b416efe5ccefac6b5e6e99ddccc23600b1f74
Jean-Baptiste Queru [Thu, 16 Sep 2010 03:05:41 +0000 (20:05 -0700)]
am
da21ccf8: Grandfather the simulator-specific modules. do not merge.
Merge commit '
da21ccf86c31fb060b5a259342fb0bfbb0362f8b' into gingerbread-plus-aosp
* commit '
da21ccf86c31fb060b5a259342fb0bfbb0362f8b':
Grandfather the simulator-specific modules. do not merge.
Jean-Baptiste Queru [Thu, 16 Sep 2010 02:51:50 +0000 (19:51 -0700)]
Grandfather the simulator-specific modules. do not merge.
Those aren't new modules that were added recently, they just never got
considered when generating the original list of grandfathered modules
Change-Id: I0e6ff940936454048b59c0fc38e24e533e8598ae
Jean-Baptiste Queru [Wed, 15 Sep 2010 21:42:46 +0000 (14:42 -0700)]
am
5890600d: Add a better explanation about how to deal with user modules
Merge commit '
5890600dac385941b6a4c6b6d0b230c1f13d54fa' into gingerbread-plus-aosp
* commit '
5890600dac385941b6a4c6b6d0b230c1f13d54fa':
Add a better explanation about how to deal with user modules
Jean-Baptiste Queru [Wed, 15 Sep 2010 20:59:29 +0000 (13:59 -0700)]
Add a better explanation about how to deal with user modules
Change-Id: Ib79cc0f4b47648daa18db97aa949cd167c8d44a9
Doug Zongker [Wed, 15 Sep 2010 20:14:26 +0000 (13:14 -0700)]
am
135a120e: remove the system board name from the build fingerprint
Merge commit '
135a120e3904d782623e4a3fc958ed098e8de384' into gingerbread-plus-aosp
* commit '
135a120e3904d782623e4a3fc958ed098e8de384':
remove the system board name from the build fingerprint
Doug Zongker [Wed, 15 Sep 2010 20:02:12 +0000 (13:02 -0700)]
remove the system board name from the build fingerprint
Change-Id: I4cbbd03084b6ac24184b7475be3d34130094667d
Jean-Baptiste Queru [Wed, 15 Sep 2010 19:56:42 +0000 (12:56 -0700)]
am
85f351d1: Merge "Allow devices without AndroidBoard.mk" into gingerbread
Merge commit '
85f351d1f925b265c401f1992b57dc028d462453' into gingerbread-plus-aosp
* commit '
85f351d1f925b265c401f1992b57dc028d462453':
Allow devices without AndroidBoard.mk
Jean-Baptiste Queru [Wed, 15 Sep 2010 19:54:56 +0000 (12:54 -0700)]
Merge "Allow devices without AndroidBoard.mk" into gingerbread
Jean-Baptiste Queru [Wed, 15 Sep 2010 18:59:33 +0000 (11:59 -0700)]
Allow devices without AndroidBoard.mk
A long time ago, Android.mk in devices had the same semantics
as the current AndroidBoard.mk. This eventually caused problems
(as it didn't allow having a true Android.mk there) so we switched,
and left an error behind in case people were still using the old
semantics (i.e. having an Android.mk but no AndroidBoard.mk).
Fast forward a few years to the present: we're finding that we want
to get rid of AndroidBoard.mk, so there are devices that will have
Android.mk but not AndroidBoard.mk. As this is becoming a legitimate
case, the error for it is removed, and the include for AndroidBoard.mk
is made optional.
Change-Id: Ic683419d4aaab122259715e0112660d2a6359e91
Ying Wang [Wed, 15 Sep 2010 18:58:41 +0000 (11:58 -0700)]
am
659adc0b: Merge "Change "make PRODUCT-XXX-tests" to build only tests-build-target" into gingerbread
Merge commit '
659adc0b54e40b3b194c84ad4ac8d2e775276e60' into gingerbread-plus-aosp
* commit '
659adc0b54e40b3b194c84ad4ac8d2e775276e60':
Change "make PRODUCT-XXX-tests" to build only tests-build-target
Ying Wang [Wed, 15 Sep 2010 18:52:34 +0000 (11:52 -0700)]
Merge "Change "make PRODUCT-XXX-tests" to build only tests-build-target" into gingerbread
Jean-Baptiste Queru [Wed, 15 Sep 2010 16:48:01 +0000 (09:48 -0700)]
am
78c5ff6d: another module that needs to be grandfathered in
Merge commit '
78c5ff6d376afc6a1a5fab8a7a24be00211c2d35' into gingerbread-plus-aosp
* commit '
78c5ff6d376afc6a1a5fab8a7a24be00211c2d35':
another module that needs to be grandfathered in
Jean-Baptiste Queru [Wed, 15 Sep 2010 15:06:05 +0000 (08:06 -0700)]
another module that needs to be grandfathered in
Change-Id: I37e0e0ae0056a2315e1102f79fd923143928f6fe
Jean-Baptiste Queru [Wed, 15 Sep 2010 16:25:36 +0000 (09:25 -0700)]
am
0dfcdcb8: another module that needs to be grandfathered in
Merge commit '
0dfcdcb8b4e76ab1ae3f9086e59b5d30e42b8394' into gingerbread-plus-aosp
* commit '
0dfcdcb8b4e76ab1ae3f9086e59b5d30e42b8394':
another module that needs to be grandfathered in
Jean-Baptiste Queru [Wed, 15 Sep 2010 15:06:05 +0000 (08:06 -0700)]
another module that needs to be grandfathered in
Change-Id: Ibf24b4507b0c367117c33476a07d7189aeb3dff7
Jean-Baptiste Queru [Wed, 15 Sep 2010 15:16:34 +0000 (08:16 -0700)]
am
6dc2a832: another module that needs to be grandfathered in
Merge commit '
6dc2a832508c08c12cb30a6bc2beb8101107cc68' into gingerbread-plus-aosp
* commit '
6dc2a832508c08c12cb30a6bc2beb8101107cc68':
another module that needs to be grandfathered in
Jean-Baptiste Queru [Wed, 15 Sep 2010 15:06:05 +0000 (08:06 -0700)]
another module that needs to be grandfathered in
Change-Id: I024ba177e6ca4745e38feb2395e57c46354c2eea