OSDN Git Service
Ying Wang [Tue, 14 Dec 2010 18:57:54 +0000 (10:57 -0800)]
Add framework includes for any aidl source.
Before this change, only aidl in apps gets the framework directories in
their include path.
Change-Id: Ieeaa162f577ea280fe71e4959cc73176b4dfd8ad
David 'Digit' Turner [Tue, 14 Dec 2010 10:45:58 +0000 (02:45 -0800)]
am
efc5d814: am
15f4980d: Merge "Add support for custom Linux host toolchains when building the SDK." into gingerbread
* commit '
efc5d81428a8c7d9cf7cb7b3a5f1a8344b02a700':
Add support for custom Linux host toolchains when building the SDK.
David 'Digit' Turner [Tue, 14 Dec 2010 10:42:10 +0000 (02:42 -0800)]
am
15f4980d: Merge "Add support for custom Linux host toolchains when building the SDK." into gingerbread
* commit '
15f4980d510824113a4d2b71d70de9c67715f3dc':
Add support for custom Linux host toolchains when building the SDK.
David 'Digit' Turner [Tue, 14 Dec 2010 10:37:05 +0000 (02:37 -0800)]
Merge "Add support for custom Linux host toolchains when building the SDK." into gingerbread
Brian Carlstrom [Mon, 13 Dec 2010 21:20:21 +0000 (13:20 -0800)]
Merge "Unify target and host Java compilation"
Brian Carlstrom [Fri, 10 Dec 2010 20:10:24 +0000 (12:10 -0800)]
Unify target and host Java compilation
This changes tries to reconcile drift between
transform-java-to-classes.jar which is used to build java for the
target with transform-host-java-to-package which is used for the
host. Several packages such as libcore are built both ways and the
drift between these rules was making it hard to make common changes to
things such as warning options.
The new compile-javac definition tries to include as much as possible
from the two previous definitions. Some conflicts it sorts out:
- hardwired -g vs PRIVATE_JAVAC_DEBUG_FLAGS
- consistent order of arguments
- moving PRIVATE_JAVAC_FLAGS to end to allow override of arguments
- xlint_unchecked is always conditional based on LOCAL_WARNINGS_ENABLE
Now what differs between the two is clear in the
transform-java-to-classes and transform-host-java-to-package
definitions. Notable differences:
- the target case supplies a bootclasspath while the host case does not.
- .class files are cleaned up after jaring in the target case,
but in the cost case they are left for the sake of the vm-tests target
which expects them to be present. That should probably be fixed in the future.
- PRIVATE_EXTRA_JAR_ARGS used to package resources into the jar only
happens for the host. Its handled by add-java-resources-to-package for the
target after dxing.
Change-Id: I2fb28f688fbb632102ca63448c2ac911db0477ae
Daniel Sandler [Mon, 13 Dec 2010 17:46:17 +0000 (12:46 -0500)]
Protips: End of line.
Bug:
3248626
Change-Id: Iecf180f64df492a3bd907697cb0778e60031ed8a
David 'Digit' Turner [Fri, 10 Dec 2010 21:24:06 +0000 (22:24 +0100)]
Add support for custom Linux host toolchains when building the SDK.
This is needed in order to build Linux SDK binaries that can run
properly on Ubuntu 8.04 (Hardy). By default, the host toolchain
on 10.04 (Lucid) generates machine code that won't run on Hardy
due to GLibc ABI mistmatches.
Note that nothing happens if the new toolchain is not in the
prebuilt tree.
Change-Id: I45c1f68e37e15a0032f885df1c5c0f297b3d8642
Ying Wang [Sat, 11 Dec 2010 00:26:59 +0000 (16:26 -0800)]
am
1f22360f: am
c7973678: Merge "Default uninstallable modules\' tag to optional" into gingerbread
* commit '
1f22360f60455ff9a486a6c757d1b974341c1895':
Default uninstallable modules' tag to optional
Ying Wang [Sat, 11 Dec 2010 00:21:43 +0000 (16:21 -0800)]
am
c7973678: Merge "Default uninstallable modules\' tag to optional" into gingerbread
* commit '
c79736785716d56768998d64317ff90a62073868':
Default uninstallable modules' tag to optional
Ying Wang [Sat, 11 Dec 2010 00:17:59 +0000 (16:17 -0800)]
Merge "Default uninstallable modules' tag to optional" into gingerbread
Ying Wang [Fri, 10 Dec 2010 19:17:28 +0000 (11:17 -0800)]
Default uninstallable modules' tag to optional
Change-Id: I31faee42c807b3b6d7b85feea6c74860c89d45de
Jean-Baptiste Queru [Fri, 10 Dec 2010 17:01:05 +0000 (09:01 -0800)]
am
2145c46a: am
2562a40e: reconcile with open-source gingerbread
* commit '
2145c46aa288c862ac3dce50877d16c0537bcea3':
Jean-Baptiste Queru [Fri, 10 Dec 2010 16:59:14 +0000 (08:59 -0800)]
am
89aa0ebf: (-s ours) Ignore
0c3d5d95 from gingerbread
* commit '
89aa0ebfb86d15672ab297264ee3bf9fd3e18ea1':
2.3.1
Jean-Baptiste Queru [Fri, 10 Dec 2010 16:58:22 +0000 (08:58 -0800)]
am
2562a40e: reconcile with open-source gingerbread
* commit '
2562a40eb1afa88e8e3b97fb4c96f2241d28ec1e':
Jean-Baptiste Queru [Fri, 10 Dec 2010 16:55:53 +0000 (08:55 -0800)]
Ignore
0c3d5d95 from gingerbread
Version number changes don't merge across codelines
Change-Id: I97e65e0ced9158da86568a32dc08f133755b9267
Jean-Baptiste Queru [Fri, 10 Dec 2010 16:12:51 +0000 (08:12 -0800)]
Jean-Baptiste Queru [Fri, 10 Dec 2010 16:05:23 +0000 (08:05 -0800)]
Jean-Baptiste Queru [Fri, 10 Dec 2010 16:01:07 +0000 (08:01 -0800)]
Merge from gingerbread
Change-Id: Icfc2bb041b1360a8a0258d7de5547fded86bf7ec
Jean-Baptiste Queru [Fri, 10 Dec 2010 15:46:16 +0000 (07:46 -0800)]
reconcile with open-source gingerbread
Change-Id: I817f61141bf2c5189b13965ea9f3ead8f19d61cb
android-merger [Thu, 9 Dec 2010 18:50:19 +0000 (10:50 -0800)]
2.3.1
Change-Id: I9096a5b7a8e85274cac23d88635d3f49e6698cd8
android-merger [Thu, 9 Dec 2010 18:50:19 +0000 (10:50 -0800)]
2.3.1
Change-Id: I64c7f35bb6cdfdfef01ce396798a0235642c0486
Ying Wang [Thu, 9 Dec 2010 04:07:48 +0000 (20:07 -0800)]
Change phony target name dist_libraries to dist_files.
Any module that does not build in apps_only build should not dist for the
default goal "droid" -- they sould dist for "dist_files" instead.
Change-Id: I8696f1ea803fbd8554ec03352e0ef369f5d7be0d
Jean-Baptiste Queru [Tue, 7 Dec 2010 00:45:01 +0000 (16:45 -0800)]
am
dbd43691: am
3ef1d674: am
4985f06f: Merge "Make image-size-from-data-size not use hard coded values."
* commit '
dbd43691870fa64d1ad79371e3d796ed8e63b3b9':
Make image-size-from-data-size not use hard coded values.
Scott Main [Tue, 7 Dec 2010 00:36:53 +0000 (16:36 -0800)]
resolved conflicts for merge of
1c4fe5aa to master
Change-Id: I3c83852dfb6a80614aad145d12cd61b65829805f
Jean-Baptiste Queru [Mon, 6 Dec 2010 23:12:02 +0000 (15:12 -0800)]
am
3ef1d674: am
4985f06f: Merge "Make image-size-from-data-size not use hard coded values."
* commit '
3ef1d674806734c2e237a54815ea5c077ce8c344':
Make image-size-from-data-size not use hard coded values.
Jean-Baptiste Queru [Mon, 6 Dec 2010 23:10:35 +0000 (15:10 -0800)]
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.
Jean-Baptiste Queru [Mon, 6 Dec 2010 22:58:08 +0000 (14:58 -0800)]
Merge "Make image-size-from-data-size not use hard coded values."
Brian Muramatsu [Mon, 6 Dec 2010 20:49:13 +0000 (12:49 -0800)]
Change from @ to $(hide) in CTS Build
Change-Id: Ibda485105f750e971260088785904ea420cbaa03
Lars Svensson [Mon, 6 Dec 2010 14:24:58 +0000 (15:24 +0100)]
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
Scott Main [Mon, 6 Dec 2010 03:04:18 +0000 (19:04 -0800)]
Scott Main [Mon, 6 Dec 2010 02:03:23 +0000 (18:03 -0800)]
docs: fix link
Change-Id: Id57ebbd12c16ef914ebe1d90260fdf8a5ae4587b
Kenny Root [Fri, 3 Dec 2010 18:59:57 +0000 (10:59 -0800)]
Add installd to PRODUCT_PACKAGES
Another change adds the "optional" tag to installd, so moving it here
and removing it from the grandfathered list.
Change-Id: I035ffd527d007cf104c15890509976fc9b99d216
Sriram Raman [Tue, 30 Nov 2010 20:09:19 +0000 (15:09 -0500)]
resolved conflicts for merge of
064a4562 to master
Change-Id: I795e2b6ba842541fc941c1da396734198a12ea72
Sriram Raman [Tue, 30 Nov 2010 19:45:14 +0000 (11:45 -0800)]
am
c647aeca: Add mkuserimg.sh, make_ext4fs to otatools
* commit '
c647aecabb9cf03d73cfc34836e3bfc886b54c2e':
Add mkuserimg.sh, make_ext4fs to otatools
Sriram Raman [Mon, 29 Nov 2010 23:51:20 +0000 (18:51 -0500)]
Add mkuserimg.sh, make_ext4fs to otatools
Change-Id: Id48d6643f4579d695685fe2595bd86a80a5083c3
Scott Main [Mon, 29 Nov 2010 23:37:31 +0000 (15:37 -0800)]
Merge "docs: revisions to the sdk doc template for preview sdk, remove ndk download table for offline docs"
Jean-Baptiste Queru [Wed, 24 Nov 2010 17:35:29 +0000 (09:35 -0800)]
am
29ead582: am
d2dd8652: Merge "Added generic hook for loading vendor specific tasks."
* commit '
29ead58259d47997d7caedf9080f4a2f9c9bd358':
Added generic hook for loading vendor specific tasks.
Jean-Baptiste Queru [Wed, 24 Nov 2010 17:33:25 +0000 (09:33 -0800)]
am
d2dd8652: Merge "Added generic hook for loading vendor specific tasks."
* commit '
d2dd86529982cd05b4010248cea368fbef763ef2':
Added generic hook for loading vendor specific tasks.
Jean-Baptiste Queru [Wed, 24 Nov 2010 17:23:35 +0000 (09:23 -0800)]
Merge "Added generic hook for loading vendor specific tasks."
Claes Elgemark [Fri, 12 Nov 2010 14:46:00 +0000 (15:46 +0100)]
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
Jeff Brown [Wed, 24 Nov 2010 00:47:34 +0000 (16:47 -0800)]
Delete the tuttle keymaps.
These files have been obsolete for years.
Change-Id: I489d22799dd0fd476b6afe296e24434d437ea75b
Jean-Baptiste Queru [Tue, 23 Nov 2010 18:54:22 +0000 (10:54 -0800)]
am
ce5d7e04: am
7fbeda2b: Merge "Adding `all\' to INTERNAL_MODIFIER_TARGETS to fix `make all\'"
* commit '
ce5d7e04a8550724b3c7dc54f84e68fbcbdb3fcb':
Adding `all' to INTERNAL_MODIFIER_TARGETS to fix `make all'
Jean-Baptiste Queru [Tue, 23 Nov 2010 18:51:44 +0000 (10:51 -0800)]
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'
Jean-Baptiste Queru [Tue, 23 Nov 2010 18:37:08 +0000 (10:37 -0800)]
Merge "Adding `all' to INTERNAL_MODIFIER_TARGETS to fix `make all'"
Magnus Bäck [Mon, 8 Nov 2010 12:44:02 +0000 (13:44 +0100)]
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
Scott Main [Mon, 22 Nov 2010 23:02:01 +0000 (15:02 -0800)]
docs: revisions to the sdk doc template for preview sdk,
remove ndk download table for offline docs
Change-Id: I13da1e5ab825f1d5c6a19ef9a76c36a3edd88bf6
Jean-Baptiste Queru [Sat, 20 Nov 2010 00:56:31 +0000 (16:56 -0800)]
am
6c7b6fb3: resolved conflicts for merge of
b2028868 to gingerbread-plus-aosp
* commit '
6c7b6fb3d2fda5cc5b881e01eb8bb0936ef0eeaf':
IA: enable SSE fpmath, Separate ARCH_VARIANT and ARCH makefile settings
Jean-Baptiste Queru [Sat, 20 Nov 2010 00:56:26 +0000 (16:56 -0800)]
am
554eeb6c: am
493306f7: Merge "Fix TARGET_PREBUILT_TAG so that get_build_var can retrieve the correct value across architectures"
* commit '
554eeb6c7426c8c1df551516cff903d69ae94f26':
Fix TARGET_PREBUILT_TAG so that get_build_var can retrieve the correct value across architectures
Jean-Baptiste Queru [Fri, 19 Nov 2010 20:35:33 +0000 (12:35 -0800)]
resolved conflicts for merge of
b2028868 to gingerbread-plus-aosp
Change-Id: Ibe616c0bdf8e36aaee42279292a2dbe03c5643c2
Jean-Baptiste Queru [Fri, 19 Nov 2010 19:15:56 +0000 (11:15 -0800)]
Merge "IA: enable SSE fpmath, Separate ARCH_VARIANT and ARCH makefile settings"
Bruce Beare [Thu, 14 Oct 2010 21:12:46 +0000 (14:12 -0700)]
IA: enable SSE fpmath, Separate ARCH_VARIANT and ARCH makefile settings
Change-Id: I60b8121c92b39a60b513bc2496a1e0a21015c586
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Jean-Baptiste Queru [Fri, 19 Nov 2010 19:15:19 +0000 (11:15 -0800)]
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
Jean-Baptiste Queru [Fri, 19 Nov 2010 19:10:14 +0000 (11:10 -0800)]
am
cc21582f: resolved conflicts for merge of
4130c80a to gingerbread-plus-aosp
* commit '
cc21582fb3699e5384dc38dad45a575451375d1a':
Correct makefile test for stagefright build
Jean-Baptiste Queru [Fri, 19 Nov 2010 19:01:22 +0000 (11:01 -0800)]
Merge "Fix TARGET_PREBUILT_TAG so that get_build_var can retrieve the correct value across architectures"
Jean-Baptiste Queru [Fri, 19 Nov 2010 18:58:11 +0000 (10:58 -0800)]
resolved conflicts for merge of
4130c80a to gingerbread-plus-aosp
Change-Id: I4c37c4a6a54c3fb005eec4789bfcf96678d8cec9
Jean-Baptiste Queru [Fri, 19 Nov 2010 18:45:27 +0000 (10:45 -0800)]
Merge "Correct makefile test for stagefright build"
Bruce Beare [Thu, 14 Oct 2010 21:14:17 +0000 (14:14 -0700)]
Correct makefile test for stagefright build
Change-Id: Ia79b97d43e3fad82491e7d6197ffef2e764a63e3
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Jean-Baptiste Queru [Fri, 19 Nov 2010 18:38:49 +0000 (10:38 -0800)]
am
f41934fc: am
26d8c589: Merge "Display the TARGET_ARCH_VARIANT"
* commit '
f41934fcd42c56a02742014e8e24520a85166117':
Display the TARGET_ARCH_VARIANT
Jean-Baptiste Queru [Fri, 19 Nov 2010 18:37:07 +0000 (10:37 -0800)]
am
26d8c589: Merge "Display the TARGET_ARCH_VARIANT"
* commit '
26d8c5896e937ed677007c23d46d6759845fe91f':
Display the TARGET_ARCH_VARIANT
Jean-Baptiste Queru [Fri, 19 Nov 2010 18:29:14 +0000 (10:29 -0800)]
Merge "Display the TARGET_ARCH_VARIANT"
Ying Wang [Fri, 19 Nov 2010 18:27:47 +0000 (10:27 -0800)]
am
92cc4c07: am
b26a65b5: Merge "Restrict make version to 3.81"
* commit '
92cc4c07475bd77ffb058f430c27b04f8cc9dfef':
Restrict make version to 3.81
Ying Wang [Fri, 19 Nov 2010 18:24:57 +0000 (10:24 -0800)]
am
b26a65b5: Merge "Restrict make version to 3.81"
* commit '
b26a65b59ff5ed777accaf34ac06ab6a86dc37c6':
Restrict make version to 3.81
Jeff Brown [Thu, 18 Nov 2010 22:32:19 +0000 (14:32 -0800)]
Merge "Revert change removing AVRCP.kl and cpcap-key.kl"
Jeff Brown [Thu, 18 Nov 2010 22:29:59 +0000 (14:29 -0800)]
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
Kenny Root [Thu, 18 Nov 2010 22:27:00 +0000 (14:27 -0800)]
Fix typo in ALL_PREBUILT error message
Change-Id: Ib59047e5c63950c84a6518a91ab6e5060c46ff21
Jeff Brown [Thu, 18 Nov 2010 22:20:53 +0000 (14:20 -0800)]
Merge "Use prebuilt keymaps in frameworks/base/data/keyboards."
Scott Main [Thu, 18 Nov 2010 20:28:44 +0000 (12:28 -0800)]
docs: revise stylesheet to allow "notes" in divs, not just paragraphs
Change-Id: Ia78a82dd330a4f31076b74ce86237af3aca1ba2e
Ying Wang [Thu, 18 Nov 2010 19:20:21 +0000 (11:20 -0800)]
Merge "Restrict make version to 3.81"
Ying Wang [Thu, 18 Nov 2010 18:32:12 +0000 (10:32 -0800)]
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
Jeff Brown [Thu, 18 Nov 2010 08:08:24 +0000 (00:08 -0800)]
Use prebuilt keymaps in frameworks/base/data/keyboards.
Change-Id: I847167abaf5538a45f40df0ed5d69c9848284871
Ying Wang [Thu, 18 Nov 2010 01:45:36 +0000 (17:45 -0800)]
Pass extfs sparse image flag to the release tool.
Change-Id: Icb2a1c4fddb2b6153298ba1b849016aa3d792773
Ying Wang [Thu, 18 Nov 2010 00:07:40 +0000 (16:07 -0800)]
Merge "Product-configurable sparse ext images."
Ying Wang [Wed, 17 Nov 2010 23:40:38 +0000 (15:40 -0800)]
Product-configurable sparse ext images.
Change-Id: Ifd0ac14d7df331c9f6f1e3eee0722e07b4ab199a
Jean-Baptiste Queru [Wed, 17 Nov 2010 23:52:09 +0000 (15:52 -0800)]
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.
Jean-Baptiste Queru [Wed, 17 Nov 2010 23:27:13 +0000 (15:27 -0800)]
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.
Jean-Baptiste Queru [Wed, 17 Nov 2010 23:15:32 +0000 (15:15 -0800)]
Merge "Enables x86-atom as a valid TARGET_ARCH_VARIANT for the simulator build."
Johnnie Birch [Mon, 2 Aug 2010 19:12:15 +0000 (12:12 -0700)]
Enables x86-atom as a valid TARGET_ARCH_VARIANT for the simulator build.
Change-Id: Idbceb6c7d4117fbecd35e4261330e6405666189e
Xavier Ducrohet [Wed, 17 Nov 2010 21:06:00 +0000 (13:06 -0800)]
Merge "Temp disabling of some apps in SDK build."
Scott Main [Wed, 17 Nov 2010 00:23:24 +0000 (16:23 -0800)]
docs: add preliminary watermark to docs
Change-Id: Ifc9ea60b53d3e5e52b9cd52174a6d8f0982fe523
Xavier Ducrohet [Tue, 16 Nov 2010 02:16:49 +0000 (18:16 -0800)]
Temp disabling of some apps in SDK build.
Change-Id: Ib8495cfe935ab96997f19e9af5a93ebbb99493ab
Ficus Kirkpatrick [Sat, 13 Nov 2010 01:38:20 +0000 (17:38 -0800)]
Fix a spelling error.
Change-Id: If89847fa16db4e2b30372678ab8f7117ad5fa0c6
Xavier Ducrohet [Thu, 11 Nov 2010 23:01:52 +0000 (15:01 -0800)]
am
f5f81fc7: am
01a9840b: Merge "Rename layoutlib_utils into ide_common"
* commit '
f5f81fc75e6f4ab598fab8876efc892243287def':
Rename layoutlib_utils into ide_common
Xavier Ducrohet [Thu, 11 Nov 2010 22:59:57 +0000 (14:59 -0800)]
am
01a9840b: Merge "Rename layoutlib_utils into ide_common"
* commit '
01a9840ba7545d9175575cc3d95b2584b2dee31c':
Rename layoutlib_utils into ide_common
Xavier Ducrohet [Thu, 11 Nov 2010 22:45:05 +0000 (14:45 -0800)]
Merge "Rename layoutlib_utils into ide_common"
Xavier Ducrohet [Thu, 11 Nov 2010 20:44:16 +0000 (12:44 -0800)]
Rename layoutlib_utils into ide_common
Change-Id: Iaa8275881dd1ee7d41c30f8b0d481253a6635271
Patrick Scott [Wed, 10 Nov 2010 12:52:42 +0000 (04:52 -0800)]
Merge "Replace grep | head | awk | tr | tr with awk."
Joe Onorato [Tue, 9 Nov 2010 16:53:01 +0000 (08:53 -0800)]
Set ro.build.characteristics to the value from PRODUCT_CHARACTERISTICS that's also passed to aapt.
Bug:
3144768
Change-Id: Ic1724c64d015de7a5c4f13709b91db51b8f10872
Scott Main [Tue, 9 Nov 2010 03:25:01 +0000 (19:25 -0800)]
am
1be24531: am
badffa84: docs: revise intro to reflect changes to quick start
* commit '
1be245314ddc88e5bde92e9a0660b1fbbd63422f':
docs: revise intro to reflect changes to quick start
Scott Main [Tue, 9 Nov 2010 01:10:25 +0000 (17:10 -0800)]
am
badffa84: docs: revise intro to reflect changes to quick start
* commit '
badffa84327de8154ea3ba96dcf908478c4d4a17':
docs: revise intro to reflect changes to quick start
Scott Main [Mon, 8 Nov 2010 20:28:14 +0000 (12:28 -0800)]
docs: revise intro to reflect changes to quick start
Change-Id: I0fdc13344831960d3fb82f80d5e391186117fc5c
Patrick Scott [Fri, 5 Nov 2010 19:00:50 +0000 (15:00 -0400)]
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
Scott Main [Sat, 6 Nov 2010 23:25:09 +0000 (16:25 -0700)]
am
9f7e7946: am
c775c754: docs: add gingerbread logo for homepage
* commit '
9f7e7946959fa776731283cbef97646b6d9d3013':
docs: add gingerbread logo for homepage
Scott Main [Sat, 6 Nov 2010 23:24:08 +0000 (16:24 -0700)]
am
56c69603: am
ec97fd30: docs: revisions to ndk download intro
* commit '
56c69603adb97e6f0a81874f16d81f538259cd55':
docs: revisions to ndk download intro
Dirk Dougherty [Sat, 6 Nov 2010 23:18:20 +0000 (16:18 -0700)]
Doc change: Merge commit '
9561b575' into master
Conflicts:
tools/droiddoc/templates-sdk/sdkpage.cs
Change-Id: Ibc2edc2550fe93b3c8f2c7e041fae81136fdb1c2
Scott Main [Sat, 6 Nov 2010 21:21:16 +0000 (14:21 -0700)]
am
c775c754: docs: add gingerbread logo for homepage
* commit '
c775c754f13bd54b7d5da8c28186cdd8167dc53a':
docs: add gingerbread logo for homepage
Wink Saville [Fri, 5 Nov 2010 22:38:37 +0000 (15:38 -0700)]
Merge "Rename protoc to aprotoc."
Scott Main [Fri, 5 Nov 2010 21:29:07 +0000 (14:29 -0700)]
docs: add gingerbread logo for homepage
Change-Id: I54db7009931e1ec5688d4f473a520a4f61db598a
Scott Main [Fri, 5 Nov 2010 20:57:15 +0000 (13:57 -0700)]
am
ec97fd30: docs: revisions to ndk download intro
* commit '
ec97fd30a6af6d954f156620a69c29352e012d39':
docs: revisions to ndk download intro
Robert Ly [Fri, 5 Nov 2010 20:57:10 +0000 (13:57 -0700)]
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