This is needed to move our modified SDL sources under external/qemu/distrib.
As per joeo's request, this change also enables target Objective-C compilation, letting it error at build time.
Merge commit 'ee6df9b4fe6e1a7431ff77d81fb8c164ee99f31d' into donut
* commit 'ee6df9b4fe6e1a7431ff77d81fb8c164ee99f31d':
AI 148870: Pinging Ryan for Dr No approval.
---
Cloned from CL 147240 by 'g4 patch'.
Original change by dwarren@dwarren-pdk on 2009/04/21 14:59:50.
"Making PDK work in SDK environment."
This CL should be pretty straight forward and should be touching only PDK
related templates, etc. Turns out we no longer need to touch the highlightNav
code.
Automated import of CL 148870
Merge commit '9b54792d7044125126a9765d1baf3ff0e59efcb4' into donut
* commit '9b54792d7044125126a9765d1baf3ff0e59efcb4':
AI 148820: adjust the "nolist" class to add bottom-spacing and refine list item padding;
add vertical padding to quickview list items so that items are distinguishable when the text wraps-around the line
BUG=1790235
Automated import of CL 148820
Merge commit '9e35a86b833c8bd520c9f889be3f2859a5ed7b45' into donut
* commit '9e35a86b833c8bd520c9f889be3f2859a5ed7b45':
AI 148675: CTS: Copy only the 'startcts' script into the cts distribution
Before CL 148645, 'startcts' called the 'cts' script. This is no longer the
case, so we want to exclude the 'cts' script from the distribution to avoid
confusion. The 'cts' script is only used when running cts directly on a
fully built source tree.
Automated import of CL 148675
Allow applypatch to use different filenames for the source and target.
(Using the same filename is still fine; in fact the target filename
can be specified as "-" to mean "same as the source file.) This will
allow us to still use diffs in the case of files being renamed, and
will allow us to use diffs for the boot and recovery images.
Merge commit '6178820340ccca2656fab0953bbe77da2e3e4bb7' into donut
* commit '6178820340ccca2656fab0953bbe77da2e3e4bb7':
AI 148430: Adding a new CTS test runner that is basically
a copy of the old one, but resides in android/cts
and is built and installed as part of the CTS.
This makes sure we always have the correct test
runner on a device, so we should see the various
improvements also on off-the-shelf Cupcake phones.
BUG=1537738
Automated import of CL 148430
Merge commit '40a06d89406a3e928a5e0d41a3077f59d8f5345d' into donut
* commit '40a06d89406a3e928a5e0d41a3077f59d8f5345d':
AI 148314: Remove droiddoc code that applies the deprecated state of superclasses to subclasses. This change was originally made in Gerrit 7655. https://review.source.android.com/Gerrit#change,7655
* changes:
Change 77 from git master branch: change the prelink-linux-arm.map to include OC 2.0 new shared libs - remove redundant share lib from the map - remove 2way share lib from the map
Merge commit 'c521e266406d0393313e17ba29ae519315a5cf6e' into donut
* commit 'c521e266406d0393313e17ba29ae519315a5cf6e':
AI 148186: Add support for using custom pdk templates. The make rule for pdk docs should set LOCAL_DROIDDOC_OPTIONS += -hdf android.whichdoc online-pdk
People keep getting confused by the default products
in this list, which are almost never what they want,
because this list roughly corresponds to the DEVICES
and not the PRODUCTS.
Now that lunch works again, I'm not too worried about
choosecombo except for the couple of cases lunch can't
handle, like the simulator. Therefore, this change
just removes the list of suggested products, and you
have to know which one you're trying to build (which
seems like a resonable prerequisite).
Merge commit '12741f56acf0a8a4feccea537d066ae6882499ce' into donut
* commit '12741f56acf0a8a4feccea537d066ae6882499ce':
AI 147874: Fix format and link errors in docs.
Merge commit 'ccd2def288d02ce5adab10bb28878fff05b70aed' into donut
* commit 'ccd2def288d02ce5adab10bb28878fff05b70aed':
AI 147847: CTS: Fix core test dependencies in CTS makefile
Merge commit '6b894c8cec676cf0811743c864bcb1937714f2c0' into donut
* commit '6b894c8cec676cf0811743c864bcb1937714f2c0':
AI 147808: add "current sdk" link using the new sdk.current variable
Merge commit '099403d15d1f87e7a17f8e2aa3d9a8bc4afa4500' into donut
* commit '099403d15d1f87e7a17f8e2aa3d9a8bc4afa4500':
AI 147796: Add widget design guidelines to new UI Guidelines area in dev guide.
Merge commit 'f22b9a0ad531f66eb0b5710abae1feefecc42c2b' into donut
* commit 'f22b9a0ad531f66eb0b5710abae1feefecc42c2b':
AI 147775: Also add ApiDemos to make sure it gets included in the TestCase repository as
Merge commit 'b3e0126a7a2d32fbae2638e9419739d2d3907c40' into donut
* commit 'b3e0126a7a2d32fbae2638e9419739d2d3907c40':
AI 147731: Forgot to submit the build changes for the
Merge commit '19a4bd164eec255f62cde30f4afc39f0aeb35c04' into donut
* commit '19a4bd164eec255f62cde30f4afc39f0aeb35c04':
AI 147710: Add redirects for sdk/preview pages.
Merge commit '6190dfe937d9972637129f86858272adcd83bd93' into donut
* commit '6190dfe937d9972637129f86858272adcd83bd93':
AI 147615: remove sdk version in parentheses from page title
Merge commit 'f23f5b486650a923e58e3e79b8ec23cc725b7b33' into donut
* commit 'f23f5b486650a923e58e3e79b8ec23cc725b7b33':
AI 147479: Update list of CTS test packages.
The core test descriptions did not list all dependencies. When building cts
for the first time, the descriptions were generated before the cts
repository was erased.
BUG=1813815
Automated import of CL 147847
