Commit Graph

2727 Commits

Author SHA1 Message Date
Ying Wang bb2b82bd55 Merge "Fix userdata partition's ext4 mount point to data." into gingerbread 2010-09-27 18:03:52 -07:00
Ying Wang 026f1451ce Fix userdata partition's ext4 mount point to data.
Bug: 3041475
Change-Id: I07306cd9c90072626dfc132d6655618ae70e64be
2010-09-27 17:49:03 -07:00
Brett Chabot ef5fd0e18f Merge "Package ddmlib-prebuilt with CTS." into gingerbread 2010-09-27 17:47:55 -07:00
Xavier Ducrohet 2daa77ee01 Package ddmlib-prebuilt with CTS.
This ensures that CTS is using a compatible ddmlib.
2010-09-27 17:28:39 -07:00
Jean-Baptiste Queru 6bc232a116 Merge "Don't reference CarHome and CarHomeLauncher" into gingerbread 2010-09-27 17:24:02 -07:00
Jean-Baptiste Queru 102b8f46a5 Don't reference CarHome and CarHomeLauncher
They're not actually part of AOSP

Change-Id: Iacb832173be7faa8ea22f74ca25e1fd68ef1dbdb
2010-09-27 17:04:41 -07:00
Ying Wang 1fdbf261a0 Don't set DISABLE_DEXPREOPT in lunch.
Because in core/main.mk WITH_DEXPREOPT is set to true only if the build OS is linux.

Change-Id: I287ab61312667f6100371d07010bcab5cfcc7e17
2010-09-27 16:25:11 -07:00
Ying Wang 30090e41e3 Set the intermediate dirs before using them.
Change-Id: Ibdab1234ca8c5a86c5226ed71e84374c3fcd7a90
2010-09-27 14:53:39 -07:00
Ying Wang 9049e321ae Add javalib.dex.jar to LOCAL_INTERMEDIATE_TARGETS
So the its target-specific PRIVATE vars can be set properly.

Change-Id: I83b60bd56ee8523b0ba97092010c76c270b60c02
2010-09-27 14:07:17 -07:00
Ying Wang 0235237805 Remove emulator-based dexpreopt logic from the build system.
Change-Id: Ic96cbd1ebb9fa65aa85bf77f18a31913625d7e1c
2010-09-27 10:37:25 -07:00
Jean-Baptiste Queru 97984c41fe reconcile froyo-release into gingerbread
Change-Id: If6c3b341b0716ef4f80721da2635b7bde45f453d
2010-09-26 17:28:49 -07:00
Doug Zongker 96a57e7377 make info_dict and GetTypeAndDevice available to device extensions
Change-Id: I3aa04cb6d7988fc1fdd7f179634b09ceab5749fb
2010-09-26 14:57:41 -07:00
Ying Wang 1448b0b702 Remove emulator-based dexpreopt code
Now dexpreopt is done on the host side.

Change-Id: I1ea1a5d1fac2531028e017364ef870abb7420be7
2010-09-26 13:11:16 -07:00
Ying Wang d56d69b621 Merge "Fix dependency when switching between build variants with and without Proguard." into gingerbread 2010-09-24 18:08:30 -07:00
Ying Wang 19f9c1c243 Fix nothing-to-do build.
Because .odex is always newer than the .jar file, so we should use "|" depdendency here.

Change-Id: Ied4c5ec4ee3294862c0a232f96c15cca2c748e11
2010-09-24 13:56:45 -07:00
Andy McFadden 6474811d64 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
2010-09-24 12:04:17 -07:00
Ficus Kirkpatrick e7f8140e6d 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.
2010-09-24 10:58:04 -07:00
Ficus Kirkpatrick 7978d50edb 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
2010-09-24 10:24:53 -07:00
Ying Wang 02c9813a72 Prebuilt NDKs are merged for linux and darwin.
Change-Id: I0b632d7ba4df5b27dda36280b22dfd0b37e116b7
2010-09-23 17:59:36 -07:00
Ying Wang 957fea52f3 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
2010-09-23 16:48:46 -07:00
Ying Wang 50d7d7a0a6 Fix private vars for host-dex rules.
Change-Id: Ie374d3abf4c261b9c5e8b80ed464b4c6b1b52b42
2010-09-23 16:34:59 -07:00
Dmitry Shmidt fb148d31ea Merge "user_tags: Remove 01-test target" into gingerbread 2010-09-23 11:06:42 -07:00
Ying Wang e7874c4308 Integrate dexpreopt into the build system.
Change-Id: Id67f85d0f5c8674f5bc22e431114ca73625811ef
2010-09-22 16:51:53 -07:00
Dmitry Shmidt 093766beb4 user_tags: Remove 01-test target
Auto-merge: no

Change-Id: I5e573660cdb4696951bcf62b611cfa71bb8395db
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2010-09-22 15:43:21 -07:00
Ying Wang 38a3161dc7 String literal change.
Change-Id: Ic1289ee3abb184b4617aa42c28e6eca812600463
2010-09-22 13:06:34 -07:00
Jesse Wilson ce7d5023c3 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
2010-09-22 11:39:18 -07:00
Doug Zongker 780c237270 accommodate both new and old target-files when creating incrementals (do not merge)
Change-Id: Ibc211164bf1dee8275e15d10cbe81b63d666069f
2010-09-22 10:12:54 -07:00
Doug Zongker ad806982c1 arg: system_size, not system_img
Change-Id: Iba5d10204c93159a4f12ea8e8d8687db5b9dd5ca
2010-09-21 17:22:14 -07:00
Brian Swetland c1a1aa1eb5 deal with gps renaming
Change-Id: I488de95880be1c4fadf23a2fb4f7e7eb686d52c2
2010-09-21 15:58:12 -07:00
Doug Zongker c0434ac8b5 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
2010-09-21 14:26:36 -07:00
android-build SharedAccount 9825eacd68 FRG83
Change-Id: I8d8fa5700e05930be8550f536561498010725fb4
2010-09-21 13:58:39 -07:00
Doug Zongker 258bf46ea6 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
2010-09-21 09:55:29 -07:00
Steve Howard 1020d271c6 Add new downloads UI to core build.
Change-Id: I96a3bb10beb6c1ec9c48baa2e2039aab7c421b09
2010-09-20 11:44:54 -07:00
Joe Onorato ad05677b0d Brian's vendor/ change requires a clean build.
Change-Id: I074fe1ec176dc005adcd79eaf7c91cc3b8d3f54c
2010-09-19 12:04:23 -04:00
Doug Zongker 6be030af29 Merge "remove remaining refs to max_image_sizes" into gingerbread 2010-09-17 07:46:07 -07:00
Doug Zongker 1684d9c0cf remove remaining refs to max_image_sizes
Change-Id: I7e4686bc06f9c3eab2df34d092021c549738b217
2010-09-17 07:45:30 -07:00
Brian Carlstrom c05d0000bb Only turn host build on for linux
Change-Id: I595948b159bc6a2bf295fd11ab831f978e38c799
2010-09-16 21:49:01 -07:00
Doug Zongker 918ccff372 Merge "consolidate target_files metadata into one key-value file" into gingerbread 2010-09-16 18:09:23 -07:00
Doug Zongker 37974731fc 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
2010-09-16 17:44:38 -07:00
Jesse Wilson 852f43bd29 Include dalvik+libcore dependencies in core product definitions.
Also conditionally include host-only dependencies when the host is
being built.

Change-Id: I0e8c9c1bef5ee60d4c1ce1c158f41b7642f9a8f2
2010-09-16 15:34:00 -07:00
android-build SharedAccount df747a140b FRG78
Change-Id: I7de099f3c8650c05d70128313c3f46db5fcad2c0
2010-09-16 14:04:48 -07:00
Doug Zongker ec5ffbabd3 allow partition sizes in hex (when prefixed with 0x)
Change-Id: I806879fd496304c449ff5315b0ef48fd766d6428
2010-09-16 13:01:26 -07:00
Doug Zongker c77a9ad444 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
2010-09-16 12:29:17 -07:00
Doug Zongker 8e8ff4cad9 Merge "support for ext4/EMMC in target_files and OTA generation" into gingerbread 2010-09-16 11:38:06 -07:00
Doug Zongker c19a8d5590 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
2010-09-16 11:34:31 -07:00
Joe Onorato 6022a9786f Merge "DO NOT MERGE - These errors were missing from the list, which made it impossible to turn them off." into gingerbread 2010-09-16 11:17:37 -07:00
Joe Onorato c0bad69b82 DO NOT MERGE - These errors were missing from the list, which made it impossible to turn them off.
Change-Id: I94652bad7084f3868049b4ea0e43bb90f86dba6f
2010-09-16 14:16:51 -04:00
Ying Wang 671f5fb09f Don't increase partition size for ext4 user images. [DO NOT MERGE]
Change-Id: I5b82e6f7bd1c25ce3b1a4c16409b61aa1be7f71f
2010-09-16 10:54:03 -07:00
Joe Onorato 27ce881183 DO NOT MERGE - Remove extra printf
Change-Id: I8a2e4fac78010fe531b080d3555557e557c038b9
2010-09-16 12:34:07 -04:00
Joe Onorato 25ab3dcce4 Merge "DO NOT MERGE - Add a -knowntags option to droiddoc" into gingerbread 2010-09-16 09:02:54 -07:00