Jean-Baptiste Queru
1804025f53
am f41934fc: am 26d8c589: Merge "Display the TARGET_ARCH_VARIANT"
...
* commit 'f41934fcd42c56a02742014e8e24520a85166117':
Display the TARGET_ARCH_VARIANT
2010-11-19 10:38:49 -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
cc6c8cb856
am 92cc4c07: am b26a65b5: Merge "Restrict make version to 3.81"
...
* commit '92cc4c07475bd77ffb058f430c27b04f8cc9dfef':
Restrict make version to 3.81
2010-11-19 10:27:47 -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
Jeff Brown
0c3909aacd
Merge "Revert change removing AVRCP.kl and cpcap-key.kl"
2010-11-18 14:32:19 -08:00
Jeff Brown
b96e34066a
Revert change removing AVRCP.kl and cpcap-key.kl
...
Cannot remove these legacy prebuilts yet because they are
referenced in the SDK.
Change-Id: I87b6d1145932edc9335b9a800672e7f653ce5521
2010-11-18 14:29:59 -08:00
Kenny Root
824d7b2f02
Fix typo in ALL_PREBUILT error message
...
Change-Id: Ib59047e5c63950c84a6518a91ab6e5060c46ff21
2010-11-18 14:27:00 -08:00
Jeff Brown
fbc4018d63
Merge "Use prebuilt keymaps in frameworks/base/data/keyboards."
2010-11-18 14:20:53 -08:00
Scott Main
63e9ccd1d6
docs: revise stylesheet to allow "notes" in divs, not just paragraphs
...
Change-Id: Ia78a82dd330a4f31076b74ce86237af3aca1ba2e
2010-11-18 13:54:40 -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
Jeff Brown
99aacc211e
Use prebuilt keymaps in frameworks/base/data/keyboards.
...
Change-Id: I847167abaf5538a45f40df0ed5d69c9848284871
2010-11-18 00:08:24 -08:00
Ying Wang
c5a07ce038
Pass extfs sparse image flag to the release tool.
...
Change-Id: Icb2a1c4fddb2b6153298ba1b849016aa3d792773
2010-11-17 17:45:36 -08:00
Ying Wang
7ca5c91389
Merge "Product-configurable sparse ext images."
2010-11-17 16:07:40 -08:00
Ying Wang
542903a27b
Product-configurable sparse ext images.
...
Change-Id: Ifd0ac14d7df331c9f6f1e3eee0722e07b4ab199a
2010-11-17 16:01:31 -08:00
Jean-Baptiste Queru
75220495d0
am 766a2a21: am 48ec6d6f: Merge "Enables x86-atom as a valid TARGET_ARCH_VARIANT for the simulator build."
...
* commit '766a2a2125d41e8bfb88112601a34af08f47f7f1':
Enables x86-atom as a valid TARGET_ARCH_VARIANT for the simulator build.
2010-11-17 15:52:09 -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
81b55adc0c
Merge "Temp disabling of some apps in SDK build."
2010-11-17 13:06:00 -08:00
Scott Main
19c43fea22
docs: add preliminary watermark to docs
...
Change-Id: Ifc9ea60b53d3e5e52b9cd52174a6d8f0982fe523
2010-11-16 16:24:42 -08:00
Xavier Ducrohet
6a5b27a4e2
Temp disabling of some apps in SDK build.
...
Change-Id: Ib8495cfe935ab96997f19e9af5a93ebbb99493ab
2010-11-15 18:31:48 -08:00
Ficus Kirkpatrick
16e2f98395
Fix a spelling error.
...
Change-Id: If89847fa16db4e2b30372678ab8f7117ad5fa0c6
2010-11-12 17:38:20 -08:00
Xavier Ducrohet
8d458ab320
am f5f81fc7: am 01a9840b: Merge "Rename layoutlib_utils into ide_common"
...
* commit 'f5f81fc75e6f4ab598fab8876efc892243287def':
Rename layoutlib_utils into ide_common
2010-11-11 15:01:52 -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
Patrick Scott
e39dd6b048
Merge "Replace grep | head | awk | tr | tr with awk."
2010-11-10 04:52:42 -08:00
Joe Onorato
25939e224e
Set ro.build.characteristics to the value from PRODUCT_CHARACTERISTICS that's also passed to aapt.
...
Bug: 3144768
Change-Id: Ic1724c64d015de7a5c4f13709b91db51b8f10872
2010-11-09 08:53:01 -08:00
Scott Main
9d1d63e2a7
am 1be24531: am badffa84: docs: revise intro to reflect changes to quick start
...
* commit '1be245314ddc88e5bde92e9a0660b1fbbd63422f':
docs: revise intro to reflect changes to quick start
2010-11-08 19:25:01 -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
Patrick Scott
fa30f5b8c4
Replace grep | head | awk | tr | tr with awk.
...
Head was causing a SIGPIPE in grep that only appeared when using
distss. This wasn't causing any build problems but spewed a lot
of warnings.
However, this change trims the command from 5 proccesses to 1 which is
nice.
Change-Id: Iac846ec1d01a022976cfc5fd28091a720ab161e7
2010-11-08 09:24:37 -05:00
Scott Main
00c837da0a
am 9f7e7946: am c775c754: docs: add gingerbread logo for homepage
...
* commit '9f7e7946959fa776731283cbef97646b6d9d3013':
docs: add gingerbread logo for homepage
2010-11-06 16:25:09 -07:00
Scott Main
d5c09153a7
am 56c69603: am ec97fd30: docs: revisions to ndk download intro
...
* commit '56c69603adb97e6f0a81874f16d81f538259cd55':
docs: revisions to ndk download intro
2010-11-06 16:24:08 -07:00
Dirk Dougherty
8ad27435f5
Doc change: Merge commit '9561b575' into master
...
Conflicts:
tools/droiddoc/templates-sdk/sdkpage.cs
Change-Id: Ibc2edc2550fe93b3c8f2c7e041fae81136fdb1c2
2010-11-06 16:18:20 -07: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
Wink Saville
c2da70dbc5
Merge "Rename protoc to aprotoc."
2010-11-05 15:38:37 -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
Ying Wang
33c0d952fc
Allow module-specific protoc flags.
...
You can add local protoc flags via LOCAL_PROTOC_FLAGS.
Change-Id: If246a4edafe1edcec6a7f193bde8ce3c83de745b
2010-11-05 11:30:58 -07:00
Wink Saville
e789083c06
Rename protoc to aprotoc.
...
With gLucid protoc is installed in the base system, by renaming
our version there will be no confusion about which compiler is
being used.
Change-Id: Id6900baacc7d57abee5dc5f694b013d7a42b35c6
2010-11-05 11:28:51 -07:00
Ying Wang
60293914c1
Set the correct proto intermediate dir for native modules.
...
Change-Id: I008778de2b81ed0c029979a7865827a96bf44b51
2010-11-05 11:20:03 -07:00
Ying Wang
3d6bf975bd
Merge "Integrate protocol buffer compiler into the build system."
2010-11-05 17:33:41 +00: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
Ying Wang
5cf0b2cf83
Merge "'make dump-products' to dump products."
2010-11-04 13:21:20 -07:00
Jean-Baptiste Queru
9e5d44b796
am 57723b52: Merge 7b393fd1
from open-source master
...
* commit '57723b52cdb446c751ba8e65fa060e7a4faf4907':
Add version_defaults.mk to be a prerequisite of build.prop
2010-11-04 10:57:36 -07:00