Merge commit '045d4af72d487ed3b21dfdf951ecb41ad5609a80' into kraken
* commit '045d4af72d487ed3b21dfdf951ecb41ad5609a80':
Adapt to new location of libcore
Merge commit '2ea21065b66da9819df92b37a79f0f87552ee331' into froyo-plus-aosp
* commit '2ea21065b66da9819df92b37a79f0f87552ee331':
add metadata to OTA package in easily-parsed form
Add in Makefiles and support files for x86 builds
Based on changes by: wonjong.lee <wonjong.lee@windriver.com>
Additional changes by: Mark Gross <mark.gross@intel.com>
Additional changes by: Bruce Beare <brucex.j.beare@intel.com>
Change-Id: Id087411b282b1b68a0251e7f9cbbdde183549787
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
For Mac OS uses BSD sed, it doesn't support "\n". Then, "make modules"
command cannot work correctly under Mac OS. Using tr command to replace
sed command, it has the same behavior under both Mac OS and Linux.
Change-Id: I29e044cc66bf24f6459cbb33164fd9f55f772e3c
Merge commit 'e611eef001a7c79ab5b89aef49235944d760806d' into kraken
* commit 'e611eef001a7c79ab5b89aef49235944d760806d':
support a few more header levels for sidebox so the sidebox can
Merge commit 'c3d808a727c2b42d48658e6fca06b1d4a9817f12' into froyo-plus-aosp
* commit 'c3d808a727c2b42d48658e6fca06b1d4a9817f12':
support a few more header levels for sidebox so the sidebox can
A package can define a LOCAL_LDFLAGS. If a LOCAL_LDFLAGS
exists, it should come after the global LDFLAGS, to allow
the local flags to override the global flags.
Change-Id: I6e44c17949c1f11c808d0ed3f327d63fb51a1468
Merge commit '381ee392e8ebba35cb65321415f4cdb537b446ed' into kraken
* commit '381ee392e8ebba35cb65321415f4cdb537b446ed':
Support building Windows SDK under Linux.
Merge commit '575cf4dc5e7d290858b1c11f4195694888a8164c' into kraken
* commit '575cf4dc5e7d290858b1c11f4195694888a8164c':
Make zipalign build for the Win SDK under Linux.
Merge commit '9ca1628e3f565607e1fdef71b570d3ddb5ec09df' into froyo-plus-aosp
* commit '9ca1628e3f565607e1fdef71b570d3ddb5ec09df':
Support building Windows SDK under Linux.
Merge commit '4c70244cb1af8b2babd7750c2bd19aeb722e19e0' into froyo-plus-aosp
* commit '4c70244cb1af8b2babd7750c2bd19aeb722e19e0':
Make zipalign build for the Win SDK under Linux.
- envsetup.mk & config.mk: we define a new BUILD_OS and a minimal set
of things like BUILD_OUT to be able to use some local tools when
doing cross-compilation. This allows us to use the Linux version of
ACP when cross-compiling the tools to Windows.
- Makfile: include windows_sdk.mk when needed to build a Windows SDK.
- main.mk: support a win_sdk target (e.g. PRODUCT-sdk-win_sdk)
(Merge master Change I9d08d0df)
make sidebox size match qv
make figure align with right margin
remove margins from the last <p> in a table cell
Change-Id: Ie655dac45728f782fb309f3c11c1b7ee56bc5660
Enable query highlighting and result ranking for search autocomplete on d.a.c. Also make it case-insensitive.
Change-Id: I3dd0e4edd7efae5a5758952699c08f1a46bdfeda
on the page) and expand all inherited members.
Also move the appropriate methods from -docs.js into -reference.js where
they belong and add some function documentation.
Change-Id: I421bbf27d3b41d377776b3d64a97380458fcebd6
Merge commit '19e9fff37e4d3309557d07cf963dc577ca49fcf0' into kraken
* commit '19e9fff37e4d3309557d07cf963dc577ca49fcf0':
Add camera sounds to the emulator system image build.
Merge commit '74134a503fc908b28ad0ff87e1291698fbceb9cf' into froyo-plus-aosp
* commit '74134a503fc908b28ad0ff87e1291698fbceb9cf':
Add camera sounds to the emulator system image build.