Commit Graph

3690 Commits

Author SHA1 Message Date
Ying Wang b6579c68a7 am 1448b0b7: Remove emulator-based dexpreopt code
Merge commit '1448b0b7023a43ff4461cc66d25230c9b6502724' into gingerbread-plus-aosp

* commit '1448b0b7023a43ff4461cc66d25230c9b6502724':
  Remove emulator-based dexpreopt code
2010-09-26 13:47:45 -07:00
Jean-Baptiste Queru 0944771fb0 Issue an error when unknown files are added to ALL_PREBUILT
Change-Id: I72b086ed7a3ad04227ce429f4d367b726d573432
2010-09-26 13:16:35 -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
Jean-Baptiste Queru a737b8371d Explicitly request ip-up-vpn
Change-Id: I05c1a3f75e9a2b9040fda3e00f0b659c613968b1
2010-09-26 10:07:09 -07:00
Ying Wang 509d28b2b3 resolved conflicts for merge of 3453d5f3 to master
Change-Id: If23d2817b4d74d48632776923805c2141da82257
2010-09-24 18:27:29 -07:00
Ying Wang 3453d5f3a2 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.
2010-09-24 18:12:12 -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 afd9652f6d am d60ab565: am 19f9c1c2: Fix nothing-to-do build.
Merge commit 'd60ab565964cfdcf70301ecf1091d3ca3dd30088'

* commit 'd60ab565964cfdcf70301ecf1091d3ca3dd30088':
  Fix nothing-to-do build.
2010-09-24 15:57:47 -07:00
Andy McFadden 9cd6150cf5 am 12165990: am 6474811d: Fix sim-eng build.
Merge commit '12165990162ac3c41aed96d5afd5e228daa16877'

* commit '12165990162ac3c41aed96d5afd5e228daa16877':
  Fix sim-eng build.
2010-09-24 15:55:42 -07:00
Ying Wang d60ab56596 am 19f9c1c2: Fix nothing-to-do build.
Merge commit '19f9c1c243262aa3c16cba026a82ad53aa2818ac' into gingerbread-plus-aosp

* commit '19f9c1c243262aa3c16cba026a82ad53aa2818ac':
  Fix nothing-to-do build.
2010-09-24 14:00:50 -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 1216599016 am 6474811d: Fix sim-eng build.
Merge commit '6474811d646153aeab111c1c0586b6ee53dcb0d2' into gingerbread-plus-aosp

* commit '6474811d646153aeab111c1c0586b6ee53dcb0d2':
  Fix sim-eng build.
2010-09-24 12:33:50 -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 62185bbd6c am 954a5e60: am e7f8140e: am 7978d50e: Add a workaround for a platform JAR parsing bug.
Merge commit '954a5e606ba6af5aef514c2c4c0d3ea2554b48f9'

* commit '954a5e606ba6af5aef514c2c4c0d3ea2554b48f9':
  Add a workaround for a platform JAR parsing bug.
2010-09-24 11:26:29 -07:00
Ying Wang 456988481f Merge "Add wpa_supplicant.conf to the core.mk" 2010-09-24 11:20:56 -07:00
Ying Wang 44f4021041 Add wpa_supplicant.conf to the core.mk
Note that wpa_supplicant.conf will only be built only if the wpa_supplicant_conf.mk
is included with some conditionals.
Bug: 3003508

Change-Id: I3d1a705c5ff5fd23a8828d5aa756ab2e4edcf4d2
2010-09-24 11:14:16 -07:00
Ficus Kirkpatrick 954a5e606b 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.
2010-09-24 11:09:40 -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 7b3bb9461a am bbbed9e1: am 02c9813a: Prebuilt NDKs are merged for linux and darwin.
Merge commit 'bbbed9e1f1be3cd8327ba89f47e9bd628d92cbe2'

* commit 'bbbed9e1f1be3cd8327ba89f47e9bd628d92cbe2':
  Prebuilt NDKs are merged for linux and darwin.
2010-09-23 21:41:18 -07:00
Ying Wang 5a2dee8786 am 4f9c4f4d: am 50d7d7a0: Fix private vars for host-dex rules.
Merge commit '4f9c4f4dbbd6ddedc7f8c61c35ea80953aa9d113'

* commit '4f9c4f4dbbd6ddedc7f8c61c35ea80953aa9d113':
  Fix private vars for host-dex rules.
2010-09-23 21:40:00 -07:00
Ying Wang bbbed9e1f1 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.
2010-09-23 18:05:38 -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 4f9c4f4dbb 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.
2010-09-23 16:42:38 -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 f553fbcdbc am 56de6843: am fb148d31: Merge "user_tags: Remove 01-test target" into gingerbread
Merge commit '56de6843674898f72c87e4dc50156b9e9a26aee7'

* commit '56de6843674898f72c87e4dc50156b9e9a26aee7':
  user_tags: Remove 01-test target
2010-09-23 11:56:34 -07:00
Dmitry Shmidt 56de684367 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
2010-09-23 11:34:33 -07:00
Dmitry Shmidt 9a7bebc6a9 Merge "user_tags: Remove 01-test target" 2010-09-23 11:21:14 -07:00
Dmitry Shmidt fb148d31ea Merge "user_tags: Remove 01-test target" into gingerbread 2010-09-23 11:06:42 -07:00
Ying Wang 31a957076b resolved conflicts for merge of 67e0c2a6 to master
Change-Id: I7940c7ae3dd1900180e4767f1c86957db4cf3a1f
2010-09-22 17:45:35 -07:00
Ying Wang 67e0c2a6bd resolved conflicts for merge of b368bba4 to gingerbread-plus-aosp
Change-Id: I50e3e45d2cd1d0a2c01f256e8f53ea4c8b2668c8
2010-09-22 17:34:05 -07:00
Ying Wang 3efd768a0d resolved conflicts for merge of 9f28f0d7 to master
Change-Id: I8fbf8846fcb41ca6cb5f3e362484ec895fe7f4aa
2010-09-22 17:19:11 -07:00
Ying Wang 9f28f0d76e am e7874c43: Integrate dexpreopt into the build system.
Merge commit 'e7874c430895b9a4e631c89f1e7729da9264d167' into gingerbread-plus-aosp

* commit 'e7874c430895b9a4e631c89f1e7729da9264d167':
  Integrate dexpreopt into the build system.
2010-09-22 16:57:01 -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
Dmitry Shmidt 0bce270587 user_tags: Remove 01-test target
Change-Id: I3a523cdd8c79a4428077e01d6f6b7bbcc6fe29ec
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2010-09-22 15:35:43 -07:00
Ying Wang 1613f4ff1e resolved conflicts for merge of 554402f7 to master
Change-Id: Ia72f326ca91311c9eaa05aa4f5a134a60171cafb
2010-09-22 14:11:49 -07:00
Jesse Wilson fed45d859a am 77070aa7: am ce7d5023: Turn dalvikvm host builds on by default when linux is the host OS.
Merge commit '77070aa757806d1617d707db4d2bd7931b2353fc'

* commit '77070aa757806d1617d707db4d2bd7931b2353fc':
  Turn dalvikvm host builds on by default when linux is the host OS.
2010-09-22 13:53:41 -07:00
Ying Wang 554402f76d am 38a3161d: String literal change.
Merge commit '38a3161dc7f5fec81df9412bc202c3962c74535d' into gingerbread-plus-aosp

* commit '38a3161dc7f5fec81df9412bc202c3962c74535d':
  String literal change.
2010-09-22 13:14:49 -07:00
Ying Wang 38a3161dc7 String literal change.
Change-Id: Ic1289ee3abb184b4617aa42c28e6eca812600463
2010-09-22 13:06:34 -07:00
Jesse Wilson 77070aa757 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.
2010-09-22 11:55:29 -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
Ying Wang b368bba41c Enforce 64-bit build environment
We will only support 64-bit build environment beyond froyo/2.2 .

Change-Id: I71eb1230bf0bc12ccde2aeda6255db6a87540437
2010-09-22 11:02:09 -07:00
Doug Zongker b8d49163fe am 7fa4a21e: (-s ours) am 780c2372: accommodate both new and old target-files when creating incrementals (do not merge)
Merge commit '7fa4a21e1872e5ef2da12f00e77fa459c6c61c1c'

* commit '7fa4a21e1872e5ef2da12f00e77fa459c6c61c1c':
  accommodate both new and old target-files when creating incrementals (do not merge)
2010-09-22 10:22:14 -07:00
Doug Zongker 7fa4a21e18 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)
2010-09-22 10:18:33 -07:00
Doug Zongker f2ab290550 accommodate both new and old target-files when creating incrementals
(cherry-picked from gingerbread.)

Change-Id: I925bf122b0012302a85c0b6f04cca48eb694b0c4
2010-09-22 10:17:31 -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 539db3b845 resolved conflicts for merge of e1daf61d to master
Change-Id: Idf5767f68dd19b51940ea69528cdd389b04d56b9
2010-09-21 20:10:32 -07:00
Brian Swetland 58118ccc56 am d451b872: (-s ours) am c1a1aa1e: deal with gps renaming
Merge commit 'd451b872babde2f97da08ba27d60e18643b76f0a'

* commit 'd451b872babde2f97da08ba27d60e18643b76f0a':
  deal with gps renaming
2010-09-21 17:44:08 -07:00