OSDN Git Service
The Android Automerger [Wed, 29 Sep 2010 13:43:43 +0000 (06:43 -0700)]
Merge branch 'master' into honeycomb-release
Brian Carlstrom [Wed, 29 Sep 2010 01:21:48 +0000 (18:21 -0700)]
am
73143d9d: am
ea83daa3: Merge "Fix mmm to work with an ANDROID_BUILD_TOP that contains a symlink" into gingerbread
Merge commit '
73143d9dfcaca5416d46be2733bb370824b3acb2'
* commit '
73143d9dfcaca5416d46be2733bb370824b3acb2':
Fix mmm to work with an ANDROID_BUILD_TOP that contains a symlink
Ying Wang [Wed, 29 Sep 2010 01:21:39 +0000 (18:21 -0700)]
am
e52fddec: am
879779a5: Merge "framework-res is not used as regular Java library now." into gingerbread
Merge commit '
e52fddec86a808b98bcdd033704b43a83cf569ea'
* commit '
e52fddec86a808b98bcdd033704b43a83cf569ea':
framework-res is not used as regular Java library now.
Brian Carlstrom [Wed, 29 Sep 2010 00:50:49 +0000 (17:50 -0700)]
am
ea83daa3: Merge "Fix mmm to work with an ANDROID_BUILD_TOP that contains a symlink" into gingerbread
Merge commit '
ea83daa389aea493294617232b5c34414861d701' into gingerbread-plus-aosp
* commit '
ea83daa389aea493294617232b5c34414861d701':
Fix mmm to work with an ANDROID_BUILD_TOP that contains a symlink
Brian Carlstrom [Wed, 29 Sep 2010 00:45:59 +0000 (17:45 -0700)]
Merge "Fix mmm to work with an ANDROID_BUILD_TOP that contains a symlink" into gingerbread
Dianne Hackborn [Wed, 29 Sep 2010 00:40:09 +0000 (17:40 -0700)]
am
3367df34: am
2f85f654: Merge "Add location shared library to core build." into gingerbread
Merge commit '
3367df348cb8b3bd6f6ff834d5cbfebfaf20e444'
* commit '
3367df348cb8b3bd6f6ff834d5cbfebfaf20e444':
Add location shared library to core build.
Ying Wang [Wed, 29 Sep 2010 00:39:46 +0000 (17:39 -0700)]
am
c292927f: am
e1926260: Treat prebuilt SDKs and the stub as normal java libraries.
Merge commit '
c292927f05ff6955b1e5ffe40b8b9777328eba55'
* commit '
c292927f05ff6955b1e5ffe40b8b9777328eba55':
Treat prebuilt SDKs and the stub as normal java libraries.
Ying Wang [Wed, 29 Sep 2010 00:36:46 +0000 (17:36 -0700)]
am
879779a5: Merge "framework-res is not used as regular Java library now." into gingerbread
Merge commit '
879779a5806d6e09d1c852a93dd4e1793bbd96cd' into gingerbread-plus-aosp
* commit '
879779a5806d6e09d1c852a93dd4e1793bbd96cd':
framework-res is not used as regular Java library now.
Ying Wang [Wed, 29 Sep 2010 00:32:36 +0000 (17:32 -0700)]
Merge "framework-res is not used as regular Java library now." into gingerbread
Ying Wang [Wed, 29 Sep 2010 00:27:56 +0000 (17:27 -0700)]
framework-res is not used as regular Java library now.
Change-Id: Ic2b8f7d7bceab3be7884eb4a7dbe721c14bd1ccb
Dianne Hackborn [Wed, 29 Sep 2010 00:19:25 +0000 (17:19 -0700)]
am
2f85f654: Merge "Add location shared library to core build." into gingerbread
Merge commit '
2f85f654eea8255ee4acd7230e4f72fc2cdaacb5' into gingerbread-plus-aosp
* commit '
2f85f654eea8255ee4acd7230e4f72fc2cdaacb5':
Add location shared library to core build.
Dianne Hackborn [Wed, 29 Sep 2010 00:14:39 +0000 (17:14 -0700)]
Merge "Add location shared library to core build." into gingerbread
Ying Wang [Tue, 28 Sep 2010 23:25:15 +0000 (16:25 -0700)]
am
e1926260: Treat prebuilt SDKs and the stub as normal java libraries.
Merge commit '
e1926260486707b3941b5488e97307f7904d1c99' into gingerbread-plus-aosp
* commit '
e1926260486707b3941b5488e97307f7904d1c99':
Treat prebuilt SDKs and the stub as normal java libraries.
Ying Wang [Tue, 28 Sep 2010 23:18:03 +0000 (16:18 -0700)]
Treat prebuilt SDKs and the stub as normal java libraries.
Change-Id: Ic5512b952d8218e63e40aeb07966de21391ef42d
android-build SharedAccount [Tue, 28 Sep 2010 22:42:38 +0000 (15:42 -0700)]
HRG90B
Change-Id: I68a4fab53dfde352eae6c311a11fa8336a759c27
Dianne Hackborn [Tue, 28 Sep 2010 21:25:05 +0000 (14:25 -0700)]
Add location shared library to core build.
Change-Id: I3ea62e2fb29611337044d4c3c10f756fb5d35f43
Brian Carlstrom [Fri, 17 Sep 2010 19:25:50 +0000 (12:25 -0700)]
Fix mmm to work with an ANDROID_BUILD_TOP that contains a symlink
Change-Id: I3dfc1aa6f10a52c2adc68259ce1cedec2ffd8f0e
Ying Wang [Tue, 28 Sep 2010 17:45:54 +0000 (10:45 -0700)]
resolved conflicts for merge of
18c00c5c to master
Change-Id: I7f6870b654e24a268a14b9c47eb8d384993273f2
Brett Chabot [Tue, 28 Sep 2010 16:27:26 +0000 (09:27 -0700)]
am
8e07b84f: am
ef5fd0e1: Merge "Package ddmlib-prebuilt with CTS." into gingerbread
Merge commit '
8e07b84fccc1c5d7ed3c5c05b922fcb50e683c18'
* commit '
8e07b84fccc1c5d7ed3c5c05b922fcb50e683c18':
Package ddmlib-prebuilt with CTS.
Jean-Baptiste Queru [Tue, 28 Sep 2010 14:20:52 +0000 (07:20 -0700)]
resolved conflicts for merge of
9bfa95cf to master
Change-Id: I70cfcd1de8a9d56900f81c174e33e433bae0508d
The Android Automerger [Tue, 28 Sep 2010 13:44:23 +0000 (06:44 -0700)]
HRG90
Change-Id: Ib201e100634c07cf93dfbf0e525c39d84caa1107
The Android Automerger [Tue, 28 Sep 2010 13:44:04 +0000 (06:44 -0700)]
Merge branch 'master' into honeycomb-release
Ying Wang [Tue, 28 Sep 2010 04:28:20 +0000 (21:28 -0700)]
am
81fcba10: am
1fdbf261: Don\'t set DISABLE_DEXPREOPT in lunch.
Merge commit '
81fcba102ea3953f525c1659914247747637ae7d'
* commit '
81fcba102ea3953f525c1659914247747637ae7d':
Don't set DISABLE_DEXPREOPT in lunch.
Ying Wang [Tue, 28 Sep 2010 04:02:50 +0000 (21:02 -0700)]
am
b09173e7: am
30090e41: Set the intermediate dirs before using them.
Merge commit '
b09173e78936f65a7f128fda2383f9ed5abce2e0'
* commit '
b09173e78936f65a7f128fda2383f9ed5abce2e0':
Set the intermediate dirs before using them.
Ying Wang [Tue, 28 Sep 2010 03:33:29 +0000 (20:33 -0700)]
am
5cb94751: am
9049e321: Add javalib.dex.jar to LOCAL_INTERMEDIATE_TARGETS
Merge commit '
5cb94751d7b3b6b92d07680bc0e7703f931e385b'
* commit '
5cb94751d7b3b6b92d07680bc0e7703f931e385b':
Add javalib.dex.jar to LOCAL_INTERMEDIATE_TARGETS
Ying Wang [Tue, 28 Sep 2010 01:05:22 +0000 (18:05 -0700)]
am
bb2b82bd: Merge "Fix userdata partition\'s ext4 mount point to data." into gingerbread
Merge commit '
bb2b82bd557b157fea5e280ef50ee782d15ac032' into gingerbread-plus-aosp
* commit '
bb2b82bd557b157fea5e280ef50ee782d15ac032':
Fix userdata partition's ext4 mount point to data.
Ying Wang [Tue, 28 Sep 2010 01:03:52 +0000 (18:03 -0700)]
Merge "Fix userdata partition's ext4 mount point to data." into gingerbread
Brett Chabot [Tue, 28 Sep 2010 00:49:46 +0000 (17:49 -0700)]
am
ef5fd0e1: Merge "Package ddmlib-prebuilt with CTS." into gingerbread
Merge commit '
ef5fd0e18fd81b094b2a64a04a2333b136c6c0c2' into gingerbread-plus-aosp
* commit '
ef5fd0e18fd81b094b2a64a04a2333b136c6c0c2':
Package ddmlib-prebuilt with CTS.
Ying Wang [Tue, 28 Sep 2010 00:49:03 +0000 (17:49 -0700)]
Fix userdata partition's ext4 mount point to data.
Bug:
3041475
Change-Id: I07306cd9c90072626dfc132d6655618ae70e64be
Brett Chabot [Tue, 28 Sep 2010 00:47:55 +0000 (17:47 -0700)]
Merge "Package ddmlib-prebuilt with CTS." into gingerbread
Dima Zavin [Tue, 28 Sep 2010 00:37:17 +0000 (17:37 -0700)]
core: Make fake packages have real installed files for proper dependencies
Change-Id: I3145440eea0fbbd8ba22a2b3b0511f4c18f90eca
Signed-off-by: Dima Zavin <dima@android.com>
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.
Jean-Baptiste Queru [Tue, 28 Sep 2010 00:28:24 +0000 (17:28 -0700)]
am
6bc232a1: Merge "Don\'t reference CarHome and CarHomeLauncher" into gingerbread
Merge commit '
6bc232a11621740d14f517218d2599a714fb451f' into gingerbread-plus-aosp
* commit '
6bc232a11621740d14f517218d2599a714fb451f':
Don't reference CarHome and CarHomeLauncher
Jean-Baptiste Queru [Tue, 28 Sep 2010 00:24:02 +0000 (17:24 -0700)]
Merge "Don't reference CarHome and CarHomeLauncher" into gingerbread
Jean-Baptiste Queru [Tue, 28 Sep 2010 00:04:41 +0000 (17:04 -0700)]
Don't reference CarHome and CarHomeLauncher
They're not actually part of AOSP
Change-Id: Iacb832173be7faa8ea22f74ca25e1fd68ef1dbdb
Ying Wang [Mon, 27 Sep 2010 23:33:43 +0000 (16:33 -0700)]
am
1fdbf261: Don\'t set DISABLE_DEXPREOPT in lunch.
Merge commit '
1fdbf261a0d550baaed96f5461bb014754364c16' into gingerbread-plus-aosp
* commit '
1fdbf261a0d550baaed96f5461bb014754364c16':
Don't set DISABLE_DEXPREOPT in lunch.
Ying Wang [Mon, 27 Sep 2010 23:25:11 +0000 (16:25 -0700)]
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
Jean-Baptiste Queru [Sun, 26 Sep 2010 22:54:18 +0000 (15:54 -0700)]
Explicitly handle bluetooth files.
This also allows to separate smartphone and nonsmartphone variants.
Change-Id: Icbd7c78a866bae32f060607f8a898d59fcd45830
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 19:05:56 +0000 (12:05 -0700)]
resolved conflicts for merge of
dc45f86a to master
Change-Id: Icb49e58c1275c160715ba26d238337213e3877fe
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
The Android Automerger [Mon, 27 Sep 2010 14:42:37 +0000 (07:42 -0700)]
HRG89
Change-Id: I32f9be75844e1ac74fe7d5220837be35a481d40e
The Android Automerger [Mon, 27 Sep 2010 14:41:46 +0000 (07:41 -0700)]
Merge branch 'master' into honeycomb-release
Mathias Agopian [Mon, 27 Sep 2010 02:13:00 +0000 (19:13 -0700)]
Merge "add screencap to PRODUCT_PACKAGES"
Mathias Agopian [Mon, 27 Sep 2010 01:52:23 +0000 (18:52 -0700)]
add screencap to PRODUCT_PACKAGES
Change-Id: Ibe0a436e80082788dfab9d43a45c99d9a87633aa
Jean-Baptiste Queru [Mon, 27 Sep 2010 00:50:59 +0000 (17:50 -0700)]
am
ef5490cf: am
97984c41: reconcile froyo-release into gingerbread
Merge commit '
ef5490cf650c65c3c5286a498b1bcdd4882ba237'
* commit '
ef5490cf650c65c3c5286a498b1bcdd4882ba237':
FRG83
FRG78
FRG75
FRG58B
FRG58
FRG57
include build timestamp in OTA metadata
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
Jean-Baptiste Queru [Sun, 26 Sep 2010 23:00:53 +0000 (16:00 -0700)]
Add some grandfathered prebuilts that were missed during the first pass
Change-Id: Ie812ad31c76d299c63ebe5c89c656866859425ed
Jean-Baptiste Queru [Sun, 26 Sep 2010 22:40:13 +0000 (15:40 -0700)]
Merge "Disable this check that was submitted by mistake."
Doug Zongker [Sun, 26 Sep 2010 22:17:44 +0000 (15:17 -0700)]
am
8317e664: am
96a57e73: make info_dict and GetTypeAndDevice available to device extensions
Merge commit '
8317e66433903badaec8ebd2b9ec2b8153f3d612'
* commit '
8317e66433903badaec8ebd2b9ec2b8153f3d612':
make info_dict and GetTypeAndDevice available to device extensions
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
Jean-Baptiste Queru [Sun, 26 Sep 2010 21:57:26 +0000 (14:57 -0700)]
Disable this check that was submitted by mistake.
There's still one device that doesn't build with this check enabled.
Change-Id: I962afe9c739df15e77ead30311c34be411674f53
Dima Zavin [Thu, 16 Sep 2010 07:25:16 +0000 (00:25 -0700)]
core: Add a phony package definition
This allows one to declare a meta-package that depends on a list
of modules. This is extremely useful for vendor provided prebulit
libraries where there is a big list of libraries/binaries to include.
Specifying that list in multiple places would be error prone and
eventually lead to very annoying bug hunts.
With a fake package, one does:
LOCAL_MODULE := my_fake_package
LOCAL_REQUIRED_MODULES := <list of required module names>
LOCAL_MODULE_TAGS := optional
include $(BUILD_PHONY_PACKAGE)
Change-Id: Idcfe91f6f2d6d886aba094981a70690e5a808bfc
Signed-off-by: Dima Zavin <dima@android.com>
Dima Zavin [Fri, 24 Sep 2010 02:07:32 +0000 (19:07 -0700)]
core: don't add file deps for modules without any installed files
Change-Id: I0acadb2ce287a1657d29dc787bd9b1c2f95aa918
Signed-off-by: Dima Zavin <dima@android.com>
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
Jean-Baptiste Queru [Sun, 26 Sep 2010 21:17:38 +0000 (14:17 -0700)]
Merge "Issue an error when unknown files are added to ALL_PREBUILT"
Ying Wang [Sun, 26 Sep 2010 21:16:20 +0000 (14:16 -0700)]
am
b6579c68: am
1448b0b7: Remove emulator-based dexpreopt code
Merge commit '
b6579c68a75c34bd1054e31182ee98406185b1e8'
* commit '
b6579c68a75c34bd1054e31182ee98406185b1e8':
Remove emulator-based dexpreopt code
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:41:29 +0000 (13:41 -0700)]
Merge "Remove emulator-based dexpreopt code" into honeycomb-release
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: Ie397def27993546b2a5cf84ad0e6a63b10adfb0e
Jean-Baptiste Queru [Sun, 26 Sep 2010 20:05:41 +0000 (13:05 -0700)]
Issue an error when unknown files are added to ALL_PREBUILT
Change-Id: I72b086ed7a3ad04227ce429f4d367b726d573432
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
The Android Automerger [Sun, 26 Sep 2010 20:00:52 +0000 (13:00 -0700)]
HRG88
Change-Id: Ibcfb998aea3c4c8a4c60c724cb2fb24bdfd2c537
The Android Automerger [Sun, 26 Sep 2010 19:59:23 +0000 (12:59 -0700)]
Merge branch 'master' into honeycomb-release
Ying Wang [Sat, 25 Sep 2010 01:27:29 +0000 (18:27 -0700)]
resolved conflicts for merge of
3453d5f3 to master
Change-Id: If23d2817b4d74d48632776923805c2141da82257
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 22:57:47 +0000 (15:57 -0700)]
Andy McFadden [Fri, 24 Sep 2010 22:55:42 +0000 (15:55 -0700)]
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
android-build SharedAccount [Fri, 24 Sep 2010 19:34:36 +0000 (12:34 -0700)]
HRG85C
Change-Id: Ic400453632c9ebab7d0bad92be7d58f2e6a8ad28
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:26:29 +0000 (11:26 -0700)]
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.
Ying Wang [Fri, 24 Sep 2010 18:20:56 +0000 (11:20 -0700)]
Merge "Add wpa_supplicant.conf to the core.mk"
Ying Wang [Fri, 24 Sep 2010 18:14:16 +0000 (11:14 -0700)]
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
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 04:41:18 +0000 (21:41 -0700)]
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.
Ying Wang [Fri, 24 Sep 2010 04:40:00 +0000 (21:40 -0700)]
am
4f9c4f4d: am
50d7d7a0: Fix private vars for host-dex rules.
Merge commit '
4f9c4f4dbbd6ddedc7f8c61c35ea80953aa9d113'
* commit '
4f9c4f4dbbd6ddedc7f8c61c35ea80953aa9d113':
Fix private vars for host-dex rules.
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
android-build SharedAccount [Thu, 23 Sep 2010 22:18:24 +0000 (15:18 -0700)]
HRG85B
Change-Id: I825c468a7b86eb869b74cde1b07ba39f4ed0602f
Dmitry Shmidt [Thu, 23 Sep 2010 18:56:34 +0000 (11:56 -0700)]
am
56de6843: am
fb148d31: Merge "user_tags: Remove 01-test target" into gingerbread
Merge commit '
56de6843674898f72c87e4dc50156b9e9a26aee7'
* commit '
56de6843674898f72c87e4dc50156b9e9a26aee7':
user_tags: Remove 01-test target
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:21:14 +0000 (11:21 -0700)]
Merge "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
The Android Automerger [Thu, 23 Sep 2010 13:42:32 +0000 (06:42 -0700)]
HRG85
Change-Id: Ibdde1710592dc7edd1d94419f4f9a19b1136a8c2
The Android Automerger [Thu, 23 Sep 2010 13:41:59 +0000 (06:41 -0700)]
Merge branch 'master' into honeycomb-release
Ying Wang [Thu, 23 Sep 2010 00:45:35 +0000 (17:45 -0700)]
resolved conflicts for merge of
67e0c2a6 to master
Change-Id: I7940c7ae3dd1900180e4767f1c86957db4cf3a1f