OSDN Git Service
The Android Automerger [Thu, 16 Sep 2010 20:58:03 +0000 (13:58 -0700)]
GRG78C
Change-Id: If525e86642e16584ef0623b6176af5cef1511a03
The Android Automerger [Thu, 16 Sep 2010 20:28:51 +0000 (13:28 -0700)]
GRG78B
Change-Id: I582a27e2e25729b21e14526c680a2e9da49e2579
The Android Automerger [Thu, 16 Sep 2010 20:28:04 +0000 (13:28 -0700)]
Merge branch 'gingerbread' into gingerbread-release
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: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: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:54:03 +0000 (10:54 -0700)]
Don't increase partition size for ext4 user images. [DO NOT MERGE]
Change-Id: I5b82e6f7bd1c25ce3b1a4c16409b61aa1be7f71f
The Android Automerger [Thu, 16 Sep 2010 16:40:21 +0000 (09:40 -0700)]
GRG78
Change-Id: Ib730c4936b7191a85f94fba0d95e0f5387813661
The Android Automerger [Thu, 16 Sep 2010 16:39:12 +0000 (09:39 -0700)]
Merge branch 'gingerbread' into gingerbread-release
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: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 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 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: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: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: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 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 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:06:05 +0000 (08:06 -0700)]
another module that needs to be grandfathered in
Change-Id: I024ba177e6ca4745e38feb2395e57c46354c2eea
The Android Automerger [Wed, 15 Sep 2010 14:11:47 +0000 (07:11 -0700)]
GRG77
Change-Id: Ib1f767a38c3d88151851bb7e1d1c7c79114b68ac
The Android Automerger [Wed, 15 Sep 2010 14:11:37 +0000 (07:11 -0700)]
Merge branch 'gingerbread' into gingerbread-release
Ying Wang [Tue, 14 Sep 2010 23:07:56 +0000 (16:07 -0700)]
Change "make PRODUCT-XXX-tests" to build only tests-build-target
Change-Id: Ib1a1a7b09ea6f1c3eea84394dcd6e3ebcda81e1a
Jean-Baptiste Queru [Tue, 14 Sep 2010 20:25:42 +0000 (13:25 -0700)]
Revert "Default host module tag to optional."
This reverts commit
528362f07460cfee42190e68ee2ffde4f08f0af4.
Jean-Baptiste Queru [Tue, 14 Sep 2010 15:59:21 +0000 (08:59 -0700)]
Fail the build when using a user tag on a non-legacy module. do not merge
The supported mechanism is to explicitly add the module
name to the PRODUCT_PACKAGES of the relevant product definitions.
Change-Id: I67bef9a967576b77a5d6c298178f03c66722eb37
The Android Automerger [Tue, 14 Sep 2010 15:25:05 +0000 (08:25 -0700)]
GRG76
Change-Id: I80d0a24959e1295d84c311ad7c17810d9147cc1d
The Android Automerger [Tue, 14 Sep 2010 15:24:53 +0000 (08:24 -0700)]
Merge branch 'gingerbread' into gingerbread-release
Ying Wang [Tue, 14 Sep 2010 01:33:31 +0000 (18:33 -0700)]
Refine the comment.
The host tools include script as well as native binaries.
Change-Id: I8bdd62bf5117ac71e2607d2cb4cd7b08bcbe7b14
Ying Wang [Tue, 14 Sep 2010 01:11:11 +0000 (18:11 -0700)]
Add host modules needed by SDK build.
Since host module tag is defaulted to optional now, we have to explicitly
add those modules to the SDK product config file.
Change-Id: I8f6c4dcb17ef7716ae3590d6e96ddd5d07cc0582
Ying Wang [Mon, 13 Sep 2010 21:56:15 +0000 (14:56 -0700)]
Default host module tag to optional.
Change-Id: I8ae572b368e7ecdcc8e5bb257bb2f6084b5fb508
The Android Automerger [Mon, 13 Sep 2010 14:50:27 +0000 (07:50 -0700)]
GRG75
Change-Id: Ifebbd36f6e452eec843f2b2ec95fc794ebaaab59
The Android Automerger [Mon, 13 Sep 2010 14:49:11 +0000 (07:49 -0700)]
Merge branch 'gingerbread' into gingerbread-release
Doug Zongker [Sun, 12 Sep 2010 22:26:16 +0000 (15:26 -0700)]
move File and Difference classes into common script
This makes them accessible from device-specific extensions (so they
can be used to send radio images as binary patches, for instance).
Change-Id: I2f2174b93b4265abf9400f9e5a0982caca0771e9
Ying Wang [Sat, 11 Sep 2010 01:38:10 +0000 (18:38 -0700)]
Fix host-dexed libraries.
With this change, host-dexed library A can have host-dexed library B in its LOCAL_JAVA_LIBRARIES.
Bug:
2992136
Change-Id: I794613d3230d4eb471a0566c325078da8fa38b86
android-build SharedAccount [Sat, 11 Sep 2010 00:31:19 +0000 (17:31 -0700)]
GRG71D
Change-Id: Ibfa9909ddeaa880ccfc0705e4f19549aba398fc9
Ying Wang [Fri, 10 Sep 2010 23:19:24 +0000 (16:19 -0700)]
Support to build host dex.
Change-Id: I55df5e4051dbeb89a70d6d7b89fb6110f133d9d7
android-build SharedAccount [Fri, 10 Sep 2010 21:49:42 +0000 (14:49 -0700)]
GRG71C
Change-Id: Ifb2367cf59f94002fdc6b6628704c21f9fda63a6
Ying Wang [Fri, 10 Sep 2010 21:39:33 +0000 (14:39 -0700)]
Dist userdataimg and tests-zip-package for tests builds
So that the build server can run the following command to build and dist only the two packages:
make -j16 tests-zip-package userdataimage-nodeps dist showcommands TARGET_BUILD_VARIANT=tests TARGET_PRODUCT=passion
Change-Id: I03d7049582ec8537a389e80b7ecdcae6625222ea
android-build SharedAccount [Fri, 10 Sep 2010 18:33:05 +0000 (11:33 -0700)]
GRG71B
Change-Id: I2810dc66c1616a444767ee118f5c2ccc43a8b8ab
The Android Automerger [Thu, 9 Sep 2010 15:12:04 +0000 (08:12 -0700)]
GRG71
Change-Id: I8ebd2debe2ec76711adfb508144570a9c423cfd2
The Android Automerger [Thu, 9 Sep 2010 01:08:45 +0000 (18:08 -0700)]
GRG70C
Change-Id: I0faf4de601ea74f4aa3a214c3436feb805f17613
The Android Automerger [Thu, 9 Sep 2010 01:08:25 +0000 (18:08 -0700)]
Merge branch 'gingerbread' into gingerbread-release
Jean-Baptiste Queru [Wed, 8 Sep 2010 22:28:41 +0000 (15:28 -0700)]
fix typo
Change-Id: If4acf972380a94b160a656f849c4106025d3e6b2
Jean-Baptiste Queru [Wed, 8 Sep 2010 19:18:04 +0000 (12:18 -0700)]
a few more existing user modules to be grandfathered in - DO NOT MERGE
Change-Id: I6a2337bb557735276c93c306caac43a59abff47c
Jean-Baptiste Queru [Wed, 8 Sep 2010 19:18:04 +0000 (12:18 -0700)]
a few more existing user modules to be grandfathered in - DO NOT MERGE
Change-Id: I5f4c9f9ac948c2ba6865eae7dca2c0ed4d10702b
Dan Bornstein [Wed, 8 Sep 2010 19:37:11 +0000 (12:37 -0700)]
Merge "Enable WITH_HOST_DALVIK for "user" builds on Linux." into gingerbread
Jean-Baptiste Queru [Wed, 8 Sep 2010 19:18:04 +0000 (12:18 -0700)]
a few more existing user modules to be grandfathered in - DO NOT MERGE
Change-Id: I7526ad40f27853a2f83bc0c4c4f80ff709fcaf40
Dan Bornstein [Wed, 8 Sep 2010 00:45:44 +0000 (17:45 -0700)]
Enable WITH_HOST_DALVIK for "user" builds on Linux.
Bug:
2497274
Change-Id: I636895b52c82f301f8c288ae670b34e1dbf32cc5
android-build SharedAccount [Wed, 8 Sep 2010 17:39:38 +0000 (10:39 -0700)]
GRG70B
Change-Id: I0559a4aee3908e18e4c5b93c7fe425b151c856f9
Jean-Baptiste Queru [Wed, 8 Sep 2010 17:22:48 +0000 (10:22 -0700)]
Merge "Warn when new modules are found that use user tags - DO NOT MERGE" into gingerbread
The Android Automerger [Wed, 8 Sep 2010 15:27:31 +0000 (08:27 -0700)]
GRG70
Change-Id: Ieea6eabc7d1384b008562a401ed4805cd20571fe
The Android Automerger [Wed, 8 Sep 2010 15:25:23 +0000 (08:25 -0700)]
Merge branch 'gingerbread' into gingerbread-release
Jean-Baptiste Queru [Tue, 7 Sep 2010 18:18:09 +0000 (11:18 -0700)]
cleanspec for corrupted build.prop
Change-Id: Ib8d6719af92759272ae25607862391647dfe408d
Jean-Baptiste Queru [Tue, 7 Sep 2010 17:51:12 +0000 (10:51 -0700)]
Revert "Allow properties with spaces in their values"
This reverts commit
de3bfade571033b01fbaccac2f0fdf7193e8d3ee.
Ying Wang [Tue, 7 Sep 2010 17:26:18 +0000 (10:26 -0700)]
Fix the unstripped path if LOCAL_MODULE_PATH is set. DO NOT MERGE
Cherry-pick from master.
Change-Id: I0a56e3e91efd53ad2671136b6fe00ee675f56230
The Android Automerger [Tue, 7 Sep 2010 16:09:46 +0000 (09:09 -0700)]
GRG69
Change-Id: I2c59e5ad26a950dc594855b9b39a1cceeef529d2
The Android Automerger [Tue, 7 Sep 2010 16:08:09 +0000 (09:08 -0700)]
Merge branch 'gingerbread' into gingerbread-release
Jean-Baptiste Queru [Fri, 3 Sep 2010 23:32:58 +0000 (16:32 -0700)]
Warn when new modules are found that use user tags - DO NOT MERGE
Change-Id: Ia563765f3d0161d7c851a0162d65c2a249b4dd38
The Android Automerger [Fri, 3 Sep 2010 23:03:38 +0000 (16:03 -0700)]
GRG65
Change-Id: I122bf81b82a13c41b7481293115bf863bfd04f2e
The Android Automerger [Fri, 3 Sep 2010 23:03:15 +0000 (16:03 -0700)]
Merge branch 'gingerbread' into gingerbread-release
Doug Zongker [Fri, 3 Sep 2010 21:31:03 +0000 (14:31 -0700)]
Merge "return to using subprocess for running commands" into gingerbread
Doug Zongker [Fri, 3 Sep 2010 21:15:34 +0000 (14:15 -0700)]
return to using subprocess for running commands
Reverts Ic4f1c747 and fixes the problem by splitting the extra_flags
argument (it wasn't working before because it was getting one argument
"-c 4096 -s 128" instead of four arguments "-c", "4096", "-s", "128"
and mkyaffs2image apparently just ignores that bogus argument?)
Change-Id: Ib1e08d634aa68bfab0f7e09680d407f2cee0797d
Doug Zongker [Wed, 21 Apr 2010 21:08:44 +0000 (14:08 -0700)]
remove remaining amend support
Remove the remaining (unused and untested) support for generating
amend scripts. This means that you won't be able to OTA directly from
cupcake to gingerbread.
Change-Id: Iaf5295db92a42b336960d05295f48b67cb729337
Joe Onorato [Fri, 3 Sep 2010 17:26:04 +0000 (10:26 -0700)]
Merge "The old clean target had bit rotted." into gingerbread
Joe Onorato [Fri, 3 Sep 2010 17:25:11 +0000 (13:25 -0400)]
The old clean target had bit rotted.
Clean and clobber are now the same thing.
Change-Id: I4873d40496b16e13689e22c48cff1fecdffb8b40
Ying Wang [Thu, 2 Sep 2010 22:41:01 +0000 (15:41 -0700)]
Fix inherited dependency when instrmentation.
It turns out we should also LOCAL_INSTRUMENTATION_FOR.
To disambiguate LOCAL_INSTRUMENTATION_FOR_PACKAGE_NAME is renamed to LOCAL_MANIFEST_INSTRUMENTATION_FOR.
Bug:
2902591
Change-Id: I6cb893c135736fc4170aa2259105b4c5eea798a1
The Android Automerger [Thu, 2 Sep 2010 22:29:26 +0000 (15:29 -0700)]
GRG64B
Change-Id: I765a1b26075e9c9d0432ac5e5379fc239a5d2396
The Android Automerger [Thu, 2 Sep 2010 22:29:15 +0000 (15:29 -0700)]
Merge branch 'gingerbread' into gingerbread-release
Jean-Baptiste Queru [Thu, 2 Sep 2010 21:30:56 +0000 (14:30 -0700)]
Allow properties with spaces in their values
This way, such properties can be set in product definition files
instead of having to live in system.prop, which eliminates the need
for system.prop
Change-Id: I25d9665f65436df8215940e46380deb31b8161ba
The Android Automerger [Thu, 2 Sep 2010 15:39:48 +0000 (08:39 -0700)]
GRG64
Change-Id: If3edb604f34d478f5a91f597a7e43e3e2cfa8f71
The Android Automerger [Thu, 2 Sep 2010 02:50:25 +0000 (19:50 -0700)]
GRG63B
Change-Id: If3b8c5989cb652d9edabe68abe25e125c25c6529
Ying Wang [Wed, 1 Sep 2010 23:39:11 +0000 (16:39 -0700)]
Disable new longjmp in glibc 2.11 and later.
Bug:
2967937
Change-Id: I4e2a5f806ad45a01ca7f8c4d032cd29fce1d794d
The Android Automerger [Wed, 1 Sep 2010 15:32:30 +0000 (08:32 -0700)]
GRG63
Change-Id: I596953b9a37c8da86e21527a350d1d14cbff0e24
The Android Automerger [Tue, 31 Aug 2010 23:05:29 +0000 (16:05 -0700)]
GRG62B
Change-Id: I26f083d424825f404cbfdccbad9de3c56b38a4de
The Android Automerger [Tue, 31 Aug 2010 23:04:50 +0000 (16:04 -0700)]
Merge branch 'gingerbread' into gingerbread-release
Joe Onorato [Tue, 31 Aug 2010 19:56:49 +0000 (12:56 -0700)]
fix the build still
Change-Id: I2bfbcdd4b463549f3f331ac7a1c7fa89aadef1a8
Joe Onorato [Tue, 31 Aug 2010 18:27:25 +0000 (11:27 -0700)]
DO NOT MERGE - Back port change from master that enforces correctness in the javadoc comments.
Change-Id: I886448a3126b81c19342d920669e050eb5ef20eb
The Android Automerger [Tue, 31 Aug 2010 15:16:02 +0000 (08:16 -0700)]
GRG62
Change-Id: I22bc8166b5537c4bde381f0b9954073b89e666b9
The Android Automerger [Tue, 31 Aug 2010 15:14:20 +0000 (08:14 -0700)]
Merge branch 'gingerbread' into gingerbread-release
Andreas Huber [Mon, 30 Aug 2010 21:17:14 +0000 (14:17 -0700)]
Cleanspec to make sure everything works consistently after turning off OpenCore.
Change-Id: Icf3ba66b8183e36247b4cfc623643e37f78d7144
related-to-bug:
2941153
Andreas Huber [Mon, 30 Aug 2010 19:48:03 +0000 (12:48 -0700)]
Build without OpenCore by default, remove obsolete opt-in to stagefright.
Change-Id: I6e08d2136147f4e279f8a5b2b3837e4317faf27c
related-to-bug:
2941153
The Android Automerger [Mon, 30 Aug 2010 16:02:29 +0000 (09:02 -0700)]
GRG61
Change-Id: I682d0e6c134492aa73fd9da9d249fba968a468d8
The Android Automerger [Mon, 30 Aug 2010 15:59:58 +0000 (08:59 -0700)]
Merge branch 'gingerbread' into gingerbread-release
android-build SharedAccount [Fri, 27 Aug 2010 04:32:22 +0000 (21:32 -0700)]
GRG57C
Change-Id: Ie77bb3fcbebf3c4c268f05d03c14a9db6c3650db
Ying Wang [Thu, 26 Aug 2010 23:04:09 +0000 (16:04 -0700)]
Refactor a bit.
Change-Id: I4573e7a5239536f49571d9222865e2526da573c8
Ying Wang [Thu, 26 Aug 2010 21:01:50 +0000 (14:01 -0700)]
Try to fix system.img in update zip file.
Change-Id: Ic4f1c7478a22b1f8134ac768904e437fcfea700a
The Android Automerger [Thu, 26 Aug 2010 19:19:47 +0000 (12:19 -0700)]
GRG57B
Change-Id: Ib88b2b8981481bf84d57d4211a6610aeb8382d60
The Android Automerger [Thu, 26 Aug 2010 15:14:37 +0000 (08:14 -0700)]
GRG57
Change-Id: I7d63a557424a0b8251cd065132e92cedd369eb8d
The Android Automerger [Thu, 26 Aug 2010 15:14:17 +0000 (08:14 -0700)]
Merge branch 'gingerbread' into gingerbread-release
Ying Wang [Thu, 26 Aug 2010 03:39:41 +0000 (20:39 -0700)]
Fix mkyaffs2image extra flags in the release tools.
Change-Id: I806e3e85ef89941edf04352331e25730c491c470
Ying Wang [Wed, 25 Aug 2010 23:06:06 +0000 (16:06 -0700)]
Disable building OTA package if there is no kernel.
Change-Id: I9a10cba92dd7f9cccd8cca58a5fa2d3a8b4620eb
Ying Wang [Wed, 25 Aug 2010 22:23:21 +0000 (15:23 -0700)]
Show command lines run by releasetools.
Change-Id: Ic204e6738781c191cd6cefefdb351f8a156b2309
Ying Wang [Wed, 25 Aug 2010 21:29:34 +0000 (14:29 -0700)]
Fix mkbootimg parameters for releasetools.
Change-Id: I6192743e9db415f5fe7f3b82081f8a82061254b3
Bill Napier [Wed, 25 Aug 2010 17:00:59 +0000 (10:00 -0700)]
Merge "DO NOT MERGE: Fix the build by ignoring directories that don't exist." into gingerbread
Bill Napier [Wed, 25 Aug 2010 16:59:14 +0000 (09:59 -0700)]
DO NOT MERGE: Fix the build by ignoring directories that don't exist.
Change-Id: I97ba9eca73f020eae0fa36ae94db35e70c9985d3