Jean-Baptiste Queru
76aa8d0a8b
update API version to 9
...
Change-Id: Ia573996bb910e19c8f7017ca13cf9d9d77083404
2010-12-14 16:16:44 -08:00
Jean-Baptiste Queru
f724dbf7cb
Merge from gingerbread
...
Change-Id: Icfc2bb041b1360a8a0258d7de5547fded86bf7ec
2010-12-10 08:01:07 -08:00
android-merger
1840de544b
2.3.1
...
Change-Id: I9096a5b7a8e85274cac23d88635d3f49e6698cd8
2010-12-10 07:42:24 -08:00
Jean-Baptiste Queru
3ef1d67480
am 4985f06f: Merge "Make image-size-from-data-size not use hard coded values."
...
* commit '4985f06f4e96351c77b88b20bc9ded65daefcd3e':
Make image-size-from-data-size not use hard coded values.
2010-12-06 15:10:35 -08:00
Jean-Baptiste Queru
4985f06f4e
Merge "Make image-size-from-data-size not use hard coded values."
2010-12-06 14:58:08 -08:00
Lars Svensson
9cb8c28352
Make image-size-from-data-size not use hard coded values.
...
The function image-size-from-data-size was using hard
coded values. The size of spare area and pages has become
configurable so we need to read from the variables.
Change-Id: I9461d34400ffc2cc5920860d8aa78750d559e397
2010-12-06 16:18:46 +01:00
Jean-Baptiste Queru
29ead58259
am d2dd8652: Merge "Added generic hook for loading vendor specific tasks."
...
* commit 'd2dd86529982cd05b4010248cea368fbef763ef2':
Added generic hook for loading vendor specific tasks.
2010-11-24 09:33:25 -08:00
Jean-Baptiste Queru
d2dd865299
Merge "Added generic hook for loading vendor specific tasks."
2010-11-24 09:23:35 -08:00
Claes Elgemark
e22ad6784c
Added generic hook for loading vendor specific tasks.
...
With this change it is possible for vendors to create rules that depend on
targets defined in Android.mk files.
This makes it easier to decouple functionality from the core buildsystem.
Very much as is done within the build git for tasks like creating SDK addon,
Generating eclipse .classpath file etc can then be done for vendors as well.
You can add targets that could perform poststeps on produced modules.
E.g. Do static verification or documentation on modules of a certain type.
You can e.g. create a target that would resign and upload all apks to a
binary repository.
Change-Id: Ic0fa7b60b919ede3c59fa2885d1fd4be1e928c04
2010-11-24 15:40:24 +01:00
Jean-Baptiste Queru
ce5d7e04a8
am 7fbeda2b: Merge "Adding `all\' to INTERNAL_MODIFIER_TARGETS to fix `make all\'"
...
* commit '7fbeda2b1ed2872b2e2ab2f7faf386a3755502df':
Adding `all' to INTERNAL_MODIFIER_TARGETS to fix `make all'
2010-11-23 10:51:44 -08:00
Jean-Baptiste Queru
7fbeda2b1e
Merge "Adding `all' to INTERNAL_MODIFIER_TARGETS to fix `make all'"
2010-11-23 10:37:08 -08:00
Magnus Bäck
6ba4ebf272
Adding `all' to INTERNAL_MODIFIER_TARGETS to fix `make all'
...
Commit e334d255
added the `all' pseudo-goal (aka internal modifier
target) to have make dex all Java modules. Unfortunately the new
pseudo-goal wasn't added to INTERNAL_MODIFIER_TARGETS so no actual
phony goal was added, resulting in the obvious
make: *** No rule to make target `all'. Stop.
error message when running `make all'. This commit changes
INTERNAL_MODIFIER_TARGETS to also include `all' so that the
pseudo-goal is treated just like `showcommands' and `checkbuild'.
Change-Id: I7905c1e27d1b17bdc1b4331744bf06e18937406f
2010-11-23 10:36:50 -08:00
Jean-Baptiste Queru
6c7b6fb3d2
resolved conflicts for merge of b2028868
to gingerbread-plus-aosp
...
Change-Id: Ibe616c0bdf8e36aaee42279292a2dbe03c5643c2
2010-11-19 12:35:33 -08:00
Jean-Baptiste Queru
b20288680e
Merge "IA: enable SSE fpmath, Separate ARCH_VARIANT and ARCH makefile settings"
2010-11-19 11:15:56 -08:00
Bruce Beare
ccec9c45d9
IA: enable SSE fpmath, Separate ARCH_VARIANT and ARCH makefile settings
...
Change-Id: I60b8121c92b39a60b513bc2496a1e0a21015c586
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2010-11-19 11:15:40 -08:00
Jean-Baptiste Queru
554eeb6c74
am 493306f7: Merge "Fix TARGET_PREBUILT_TAG so that get_build_var can retrieve the correct value across architectures"
...
* commit '493306f7c318d632186bebd732708d4299e66a62':
Fix TARGET_PREBUILT_TAG so that get_build_var can retrieve the correct value across architectures
2010-11-19 11:15:19 -08:00
Jean-Baptiste Queru
493306f7c3
Merge "Fix TARGET_PREBUILT_TAG so that get_build_var can retrieve the correct value across architectures"
2010-11-19 11:01:22 -08:00
Jean-Baptiste Queru
cc21582fb3
resolved conflicts for merge of 4130c80a
to gingerbread-plus-aosp
...
Change-Id: I4c37c4a6a54c3fb005eec4789bfcf96678d8cec9
2010-11-19 10:58:11 -08:00
Jean-Baptiste Queru
4130c80aa3
Merge "Correct makefile test for stagefright build"
2010-11-19 10:45:27 -08:00
Bruce Beare
885b6b99d3
Correct makefile test for stagefright build
...
Change-Id: Ia79b97d43e3fad82491e7d6197ffef2e764a63e3
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2010-11-19 10:45:11 -08:00
Jean-Baptiste Queru
f41934fcd4
am 26d8c589: Merge "Display the TARGET_ARCH_VARIANT"
...
* commit '26d8c5896e937ed677007c23d46d6759845fe91f':
Display the TARGET_ARCH_VARIANT
2010-11-19 10:37:07 -08:00
Jean-Baptiste Queru
26d8c5896e
Merge "Display the TARGET_ARCH_VARIANT"
2010-11-19 10:29:14 -08:00
Ying Wang
92cc4c0747
am b26a65b5: Merge "Restrict make version to 3.81"
...
* commit 'b26a65b59ff5ed777accaf34ac06ab6a86dc37c6':
Restrict make version to 3.81
2010-11-19 10:24:57 -08:00
Ying Wang
b26a65b59f
Merge "Restrict make version to 3.81"
2010-11-18 11:20:21 -08:00
Ying Wang
4f9269ef75
Restrict make version to 3.81
...
Bug: 3209290
It turns out that gmake 3.82 on Mac OSX crashes with segmentation fault
at some point.
Change-Id: I7b632abe1cafc5f0ff2ea45611d8ccf0aa3f976a
2010-11-18 11:18:52 -08:00
Jean-Baptiste Queru
766a2a2125
am 48ec6d6f: Merge "Enables x86-atom as a valid TARGET_ARCH_VARIANT for the simulator build."
...
* commit '48ec6d6f814a70068c4632b468cd7872f34295ad':
Enables x86-atom as a valid TARGET_ARCH_VARIANT for the simulator build.
2010-11-17 15:27:13 -08:00
Jean-Baptiste Queru
48ec6d6f81
Merge "Enables x86-atom as a valid TARGET_ARCH_VARIANT for the simulator build."
2010-11-17 15:15:32 -08:00
Johnnie Birch
a4716b2618
Enables x86-atom as a valid TARGET_ARCH_VARIANT for the simulator build.
...
Change-Id: Idbceb6c7d4117fbecd35e4261330e6405666189e
2010-11-17 15:15:08 -08:00
Xavier Ducrohet
f5f81fc75e
am 01a9840b: Merge "Rename layoutlib_utils into ide_common"
...
* commit '01a9840ba7545d9175575cc3d95b2584b2dee31c':
Rename layoutlib_utils into ide_common
2010-11-11 14:59:57 -08:00
Xavier Ducrohet
01a9840ba7
Merge "Rename layoutlib_utils into ide_common"
2010-11-11 14:45:05 -08:00
Xavier Ducrohet
2e5ee27e9e
Rename layoutlib_utils into ide_common
...
Change-Id: Iaa8275881dd1ee7d41c30f8b0d481253a6635271
2010-11-11 12:44:16 -08:00
Scott Main
1be245314d
am badffa84: docs: revise intro to reflect changes to quick start
...
* commit 'badffa84327de8154ea3ba96dcf908478c4d4a17':
docs: revise intro to reflect changes to quick start
2010-11-08 17:10:25 -08:00
Scott Main
badffa8432
docs: revise intro to reflect changes to quick start
...
Change-Id: I0fdc13344831960d3fb82f80d5e391186117fc5c
2010-11-08 16:10:18 -08:00
Scott Main
9f7e794695
am c775c754: docs: add gingerbread logo for homepage
...
* commit 'c775c754f13bd54b7d5da8c28186cdd8167dc53a':
docs: add gingerbread logo for homepage
2010-11-06 14:21:16 -07:00
Scott Main
c775c754f1
docs: add gingerbread logo for homepage
...
Change-Id: I54db7009931e1ec5688d4f473a520a4f61db598a
2010-11-05 14:29:07 -07:00
Scott Main
56c69603ad
am ec97fd30: docs: revisions to ndk download intro
...
* commit 'ec97fd30a6af6d954f156620a69c29352e012d39':
docs: revisions to ndk download intro
2010-11-05 13:57:15 -07:00
Robert Ly
9561b57543
am 706e41e5: Update the template text for the NDK download page to point to new links
...
* commit '706e41e55f2e3b456c51b56ba07d1dfd56716af9':
Update the template text for the NDK download page to point to new links
2010-11-05 13:57:10 -07:00
Scott Main
ec97fd30a6
docs: revisions to ndk download intro
...
Change-Id: Ib1ba3d5f0e727a1246dc92161b72bcfff6f9d772
2010-11-04 21:02:14 -07:00
Robert Ly
706e41e55f
Update the template text for the NDK download page to point to new
...
links
Change-Id: Icb1571eae18dcd9f9f86c5fd855f15783f9d4ae4
2010-11-04 13:36:37 -07:00
Jean-Baptiste Queru
57723b52cd
Merge 7b393fd1
from open-source master
...
Change-Id: I5fee3ccbf7845d087e72848b4cec0198cd4afc26
2010-11-04 07:24:56 -07:00
Jean-Baptiste Queru
7b393fd131
Merge "Add version_defaults.mk to be a prerequisite of build.prop"
2010-11-03 10:29:55 -07:00
Chih-Wei Huang
75947ef5ef
Add version_defaults.mk to be a prerequisite of build.prop
...
The version_defaults.mk defines variables that may affect
the content of build.prop.
Change-Id: Iabb82459949bb6e7a91829c5b485aad331c50b72
2010-11-03 18:33:46 +08:00
Jean-Baptiste Queru
6be29424c6
am 892ea1ea: Merge "build: Add spare size flag to mkyaffs2image"
...
* commit '892ea1eaadfa5b57948bb66bd3432e06c58188e1':
build: Add spare size flag to mkyaffs2image
2010-11-02 14:17:54 -07:00
Jean-Baptiste Queru
892ea1eaad
Merge "build: Add spare size flag to mkyaffs2image"
2010-11-02 09:01:30 -07:00
Naseer Ahmed
53871886bd
build: Add spare size flag to mkyaffs2image
...
Change-Id: Ib3a915ba5296d31f88cdc81e13da02f281dbdb9f
2010-11-02 08:59:39 -07:00
Scott Main
987fb055d1
am 2e94aa25: docs: make the resizable side nav standard. DO NOT MERGE. This actually affects only the SDK tab, which previously did not allow resizing---now it does. Also add a couple new templates to allow either 190 or 200 pixel-wide side navigation by default, and
...
* commit '2e94aa25d458e96d6503b88c52e81c65fb34a9d0':
docs: make the resizable side nav standard. DO NOT MERGE. This actually affects only the SDK tab, which previously did not allow resizing---now it does. Also add a couple new templates to allow either 190 or 200 pixel-wide side navigation by default, and apply 200 to the Resources tab.
2010-11-01 20:21:39 -07:00
Scott Main
2e94aa25d4
docs: make the resizable side nav standard. DO NOT MERGE.
...
This actually affects only
the SDK tab, which previously did not allow resizing---now it does.
Also add a couple new templates to allow either 190 or 200 pixel-wide
side navigation by default, and apply 200 to the Resources tab.
Change-Id: I4555c496088dd8aac77f9aa01273c3a1d52f89e0
2010-11-01 15:53:06 -07:00
Scott Main
e9e311a47b
am fa83b5e4: Merge "docs: update sdk download template DO NOT MERGE add windows installer and revise a bit else" into gingerbread
...
* commit 'fa83b5e4daf43a431463e80c56fe115a6db3ca04':
docs: update sdk download template DO NOT MERGE add windows installer and revise a bit else
2010-11-01 10:53:08 -07:00
Scott Main
fa83b5e4da
Merge "docs: update sdk download template DO NOT MERGE add windows installer and revise a bit else" into gingerbread
2010-11-01 10:49:07 -07:00
Raphael Moll
3a632f7d37
am 4aa7a190: Merge "Fix "make acp" under Cygwin. DO NOT MERGE."
...
* commit '4aa7a190bb81b7e3ad12d53b83908c3c72745f6e':
Fix "make acp" under Cygwin. DO NOT MERGE.
2010-10-29 19:03:49 -07:00