d143814d63
am b114e228: am 4221fdbd: am 1048bd3f: docs: revert the change that made "new" tags stick on the first line and thus allow them to wrap.
...
* commit 'b114e228a685cbc41f29d6d1b9c0925aff062b96':
2012-04-03 14:10:19 -07:00
0772cb651d
am ad921800: am 0af1d53e: am 1048bd3f: docs: revert the change that made "new" tags stick on the first line and thus allow them to wrap.
...
* commit 'ad92180046266eb0cbf0ea76b769e68caef5e778':
docs: revert the change that made "new" tags stick on the first line and thus allow them to wrap.
2012-04-03 14:10:18 -07:00
b114e228a6
am 4221fdbd: am 1048bd3f: docs: revert the change that made "new" tags stick on the first line and thus allow them to wrap.
...
* commit '4221fdbde9c240cdae20d837867d7fd0a5977273':
2012-04-03 14:07:59 -07:00
ad92180046
am 0af1d53e: am 1048bd3f: docs: revert the change that made "new" tags stick on the first line and thus allow them to wrap.
...
* commit '0af1d53ef2db4c1e72b675e9868610e1d6b11236':
docs: revert the change that made "new" tags stick on the first line and thus allow them to wrap.
2012-04-03 14:06:28 -07:00
4221fdbde9
am 1048bd3f: docs: revert the change that made "new" tags stick on the first line and thus allow them to wrap.
...
* commit '1048bd3fb3c34de37375a6f1c8cd10f88411f758':
docs: revert the change that made "new" tags stick on the first line and thus allow them to wrap.
2012-04-03 14:02:40 -07:00
0af1d53ef2
am 1048bd3f: docs: revert the change that made "new" tags stick on the first line and thus allow them to wrap.
...
* commit '1048bd3fb3c34de37375a6f1c8cd10f88411f758':
docs: revert the change that made "new" tags stick on the first line and thus allow them to wrap.
2012-04-03 14:00:18 -07:00
1048bd3fb3
docs: revert the change that made "new" tags stick on the first line
...
and thus allow them to wrap.
Change-Id: Id6b68e38a11f4fb314a0408c78bf7e2b543c8d00
2012-04-03 13:26:25 -07:00
5957e33835
Merge "Revert "Update versions of the Eclipse prebuilt libraries""
2012-04-03 12:42:28 -07:00
8245810475
Revert "Update versions of the Eclipse prebuilt libraries"
...
This reverts commit 94c85043c1
2012-04-03 11:14:16 -07:00
0740802bc9
Merge remote-tracking branch 'goog/ics-aah'
2012-04-03 10:09:34 -07:00
8c8a60e98a
Merge "Support to run DroidDoc in unbundled builds."
2012-04-03 09:27:28 -07:00
bcfa78b60a
Merge "Update versions of the Eclipse prebuilt libraries"
2012-04-03 07:56:32 -07:00
3f45b3c35c
Support to run DroidDoc in unbundled builds.
...
Change-Id: Ia5ace10ed75c451e346e289f0c534ad619abdb65
2012-04-02 18:32:05 -07:00
2109487a29
Changes to C++ protocol buffer compilation.
...
Generate C++ code for all .proto files before attempting
to compile them. This takes care of the case where generated
.pb.cc files include other header / c++ files due to proto
imports in the original .proto files.
Change-Id: I26513842618fd31f0b33a3f10df2a5e556094515
2012-04-02 18:39:31 +01:00
406f69c8d6
Merge "Support to build pdk and pdk fusion."
2012-04-02 09:17:56 -07:00
d222192fb0
Merge "Generate platfrom.zip for build goal "platform"."
2012-04-02 09:11:47 -07:00
0cae3313e2
Merge "Remove base_intermediates from LOCAL_C_INCLUDES"
2012-04-01 17:54:04 -07:00
9ad36ef929
Remove base_intermediates from LOCAL_C_INCLUDES
...
base_intermediates is not used anywhere in the main build system,
and should not be part of LOCAL_C_INCLUDES. It is used by
external/webkit/Android.mk as a local variable, which causes
the libwebcore_intermediates directory to be added to the include
path for every module.
Change-Id: Iddeee880add4b6f694a15d1900c588e1c547b9df
2012-03-30 19:32:37 -07:00
82b836fda6
Support to build pdk and pdk fusion.
...
Bug: 6241618
Change-Id: I08f74019631e9e132c15cdb2916bbafb052f9aa6
2012-03-30 18:57:52 -07:00
ee406f1cbe
Merge "Moving notice file generation to a python script (it was getting fairly complicated in bash), update HTML output to have a table of contents, and fix typos/bugs in notice file CSS"
2012-03-30 16:48:50 -07:00
4c289e5041
Generate platfrom.zip for build goal "platform".
...
Bug: 6241618
If platform appears on the build command line, build platform.zip,
which essentially is the zip package of the system directory.
Put the platform.zip to the dist dir if "dist" is specified too,
so the platform.zip can be downloaded from the build page.
Change-Id: I988dd5c753a4ee744b4e3dccf261d8df904d9847
2012-03-30 13:56:35 -07:00
f5a97d7fbb
Moving notice file generation to a python script
...
(it was getting fairly complicated in bash),
update HTML output to have a table of contents,
and fix typos/bugs in notice file CSS
Change-Id: I51131f594e3bbe63f03165fa42f5ceeaec518543
2012-03-30 15:08:59 -04:00
06e758a966
config: add documentation for managing kernel-headers
...
Change-Id: I6dc6ede4703cbe88c356656a1a6b86a4ffaafa3b
Signed-off-by: Dima Zavin <dima@android.com>
2012-03-30 10:46:28 -07:00
8e4042cc79
Revert "core: the device/board/product kernel headers will be auto-generated"
...
This reverts commit 992a52990c
2012-03-30 10:46:28 -07:00
f5172c7564
Switch default gcc toolchain from 4.4.3 to 4.6.
...
Switch both arm-linux-androideabi toolchainand arm-eabi toolchain.
Change-Id: I7b2771fe684853ab37e3b5b7cfe4146f9f901e02
2012-03-29 20:45:50 -07:00
971c246cb5
Remove some dist targets from PDK builds
...
Remove apps.zip and package_stats.txt from the PDK build, they
fail because no apps or jar files are built.
Remove emulator.zip, the emulator is not built.
Also, put recovery.img back into the PDK build, it is needed by
the img.zip target, and will be necessary for fusion builds.
Change-Id: Ie314e0432881d3ee4f1ef3eec5a98be6b8581572
2012-03-29 14:31:08 -07:00
1f3f38c9b3
am 33666ade: docs: re-add android design icon, which had been removed from original location
...
* commit '33666ade7a13f2c466346b05b2a7dd1f0f80cb43':
docs: re-add android design icon, which had been removed from original location
2012-03-29 12:09:44 -07:00
51cf729aad
Include new raw audio decoder.
...
Change-Id: I7352c927a4d9f804f92b743d903b06c7745f3fbf
2012-03-29 11:34:46 -07:00
3a7ede24dd
install drm libraries and drmserver to the core product, which covers sdk build
...
o related-to-bug: 6246463
Change-Id: Ifaef3cd71d05c7e1ca3d7b3c459bfa4bea0d2e20
2012-03-28 19:08:44 -07:00
88bd4641e0
Merge "don't build apicheck for PDK builds, removing dependency on doclava"
2012-03-28 15:31:33 -07:00
b8775421a5
don't build apicheck for PDK builds, removing dependency on doclava
...
PDK builds have no Java APIs...
Change-Id: I719e0c206234d03a70f3178fd618676f8ee0e6f4
2012-03-28 15:30:36 -07:00
ed6d9db2cd
Merge "Moving libRS"
2012-03-28 15:09:01 -07:00
0b7d3d69bc
Moving libRS
...
Change-Id: I45058b3e1cc213db6e322090f86dd19a6747fc4c
2012-03-28 14:22:55 -07:00
bf2c759a67
Merge "audio configuration file path change because it is relocated"
2012-03-28 12:21:22 -07:00
bbd4998216
Add samsung_arm as an owner
...
Add samsung_arm as an owner to be used on files that depend
on licenses from both Samsung and ARM.
Change-Id: I03a5ba739b940915519f75477adea7c2a9b0a563
2012-03-28 09:34:28 -07:00
b683895db8
Merge "telephony: remove default apns_conf.xml"
2012-03-28 09:34:16 -07:00
89912bec23
Merge "Move keystore from user_tags to core req"
2012-03-27 20:41:57 -07:00
73ef9bcee3
am 5d2f6cb1: am f515ad27: am b6addfb2: am a8dd58a8: Merge "Allow make 3.82 to be used under Cygwin 1.7"
...
* commit '5d2f6cb1b1901521194e8a9f5d7d50b6260d71e6':
Allow make 3.82 to be used under Cygwin 1.7
2012-03-27 17:58:57 -07:00
8c4d5952eb
am be8d46c7: am d0bcf386: am 2696eb6d: am 3b1ebe7d: Merge "SDK atree: support HOST_OUT location."
...
* commit 'be8d46c70e70c451e9cae90e5801623029050c4f':
SDK atree: support HOST_OUT location.
2012-03-27 17:58:56 -07:00
5d2f6cb1b1
am f515ad27: am b6addfb2: am a8dd58a8: Merge "Allow make 3.82 to be used under Cygwin 1.7"
...
* commit 'f515ad27974dc18a2ae2579cee16a800d539d06d':
Allow make 3.82 to be used under Cygwin 1.7
2012-03-27 17:57:40 -07:00
be8d46c70e
am d0bcf386: am 2696eb6d: am 3b1ebe7d: Merge "SDK atree: support HOST_OUT location."
...
* commit 'd0bcf3869e8f60892dea6983ed2b9ff6e6d203f5':
SDK atree: support HOST_OUT location.
2012-03-27 17:57:39 -07:00
f515ad2797
am b6addfb2: am a8dd58a8: Merge "Allow make 3.82 to be used under Cygwin 1.7"
...
* commit 'b6addfb250606175ca679c8fb6e549cd98eee5b0':
Allow make 3.82 to be used under Cygwin 1.7
2012-03-27 17:55:44 -07:00
d0bcf3869e
am 2696eb6d: am 3b1ebe7d: Merge "SDK atree: support HOST_OUT location."
...
* commit '2696eb6d11759e8a0cd839e9f10c90e38efea21a':
SDK atree: support HOST_OUT location.
2012-03-27 17:55:43 -07:00
b6addfb250
am a8dd58a8: Merge "Allow make 3.82 to be used under Cygwin 1.7"
...
* commit 'a8dd58a8a604ed90c5fd5fb632eb2bb8b1ff8fa0':
Allow make 3.82 to be used under Cygwin 1.7
2012-03-27 17:53:32 -07:00
2696eb6d11
am 3b1ebe7d: Merge "SDK atree: support HOST_OUT location."
...
* commit '3b1ebe7dc291175886f21ffbbccdb98b560efabf':
SDK atree: support HOST_OUT location.
2012-03-27 17:53:32 -07:00
8f4c3116b2
telephony: remove default apns_conf.xml
...
Remove the hack from main.mk to filter through installed files
to look for an apns file.
Change-Id: I31ba69bfc8323fea0a38154922df6b57a0f227c8
Signed-off-by: Dima Zavin <dima@android.com>
2012-03-27 17:30:26 -07:00
e455a972be
Merge "Multi-Project Commit: Move of filterfw out of system/media (3 of 7)"
2012-03-27 16:29:47 -07:00
a8dd58a8a6
Merge "Allow make 3.82 to be used under Cygwin 1.7"
2012-03-27 16:16:45 -07:00
4c45699015
Allow make 3.82 to be used under Cygwin 1.7
...
(Manual merge of 76bf62d75e
2012-03-27 14:35:34 -07:00
3b1ebe7dc2
Merge "SDK atree: support HOST_OUT location."
2012-03-27 11:40:47 -07:00
Scott Main