Stephen Hines
78706f9149
am 0db9ea92: Merge "Fix a preprocessor warning exposed by -Wundef."
...
* commit '0db9ea923309f514a3216826593b325cffcfbbbf':
Fix a preprocessor warning exposed by -Wundef.
2014-12-02 22:00:35 +00:00
Stephen Hines
0db9ea9233
Merge "Fix a preprocessor warning exposed by -Wundef."
2014-12-02 19:25:19 +00:00
Stephen Hines
d134f252ef
Fix a preprocessor warning exposed by -Wundef.
...
Bug: 18589470
__LP64__ is only defined for 64-bit compilation targets, so this macro
is evaluated as an implicit 0 in the original case. This change makes
it explicit that we only care whether this is actually defined.
Change-Id: I8c11b41fc0bde9477c5efeea0782d9741d9d827d
2014-12-02 11:17:07 -08:00
Ying Wang
d537e9a3e9
am f5d6b367: am b60408bb: am 8070b20f: Support to build dpi-specific apk variants.
...
* commit 'f5d6b36748d266ca3198f09c2327f66d60696860':
Support to build dpi-specific apk variants.
2014-12-02 19:05:27 +00:00
Elliott Hughes
e75dc20094
am c645cf46: am 7e7fc27c: Merge "Remove unused BUILD_RAW_EXECUTABLE and BUILD_RAW_STATIC_LIBRARY."
...
* commit 'c645cf46b7666942a8bd044d4215b140d3445b8f':
Remove unused BUILD_RAW_EXECUTABLE and BUILD_RAW_STATIC_LIBRARY.
2014-12-02 19:01:42 +00:00
Stephen Hines
e3d102807c
am b2f55103: am 4bad2d21: Merge "Add more support for GLOBAL_CONLYFLAGS."
...
* commit 'b2f5510365be26e279a8d02770a9f46e57741d54':
Add more support for GLOBAL_CONLYFLAGS.
2014-12-02 19:01:41 +00:00
smain@google.com
55bbab956b
new version of Helpouts recruit banner for TV and Wear
...
Change-Id: I971e9043b60bdb925c2f648e0aff3de9d8c9cd81
2014-12-02 11:01:20 -08:00
Ying Wang
f5d6b36748
am b60408bb: am 8070b20f: Support to build dpi-specific apk variants.
...
* commit 'b60408bb53a4a63cd186c5bedfded90856b60d73':
Support to build dpi-specific apk variants.
2014-12-02 18:54:35 +00:00
Elliott Hughes
c645cf46b7
am 7e7fc27c: Merge "Remove unused BUILD_RAW_EXECUTABLE and BUILD_RAW_STATIC_LIBRARY."
...
* commit '7e7fc27cbc7208598473e875e8bee3e3dfeb6ff9':
Remove unused BUILD_RAW_EXECUTABLE and BUILD_RAW_STATIC_LIBRARY.
2014-12-02 18:52:13 +00:00
Stephen Hines
b2f5510365
am 4bad2d21: Merge "Add more support for GLOBAL_CONLYFLAGS."
...
* commit '4bad2d2156bcb589c2d1bb223a074edc39aa428c':
Add more support for GLOBAL_CONLYFLAGS.
2014-12-02 18:52:12 +00:00
Ying Wang
b60408bb53
am 8070b20f: Support to build dpi-specific apk variants.
...
* commit '8070b20f9ec899a5dc27c7589f11c6db8c72180a':
Support to build dpi-specific apk variants.
2014-12-02 18:45:55 +00:00
Elliott Hughes
7e7fc27cbc
Merge "Remove unused BUILD_RAW_EXECUTABLE and BUILD_RAW_STATIC_LIBRARY."
2014-12-02 18:42:26 +00:00
Stephen Hines
4bad2d2156
Merge "Add more support for GLOBAL_CONLYFLAGS."
2014-12-02 18:35:17 +00:00
Ying Wang
8070b20f9e
Support to build dpi-specific apk variants.
...
In unbundled apps_only build, in addition to the base apk, you can also
build the dpi-specific apk variants, with:
LOCAL_DPI_VARIANTS := <a list of dpi names>
Previously user needs to include $(BUILD_PACKAGE) repeatedly with the
same package definition except dpi flags.
With this change, all the dpi-specific apk variants share the base apk's
compiled Java code and only diverge at the point we add resources/assets
to the apk.
Also we set up variables/targets/rules in a way those dpi-specific apks
appear to be independent apks to the users, for example, you can pass
"AppName_<dpi_name>" to tapas, and AppName_<dpi_name>.apk lives in its
own intermediate directory.
Bug: 18388705
Change-Id: I2ba4972ea7d1f796352fab2407888f996781ae44
2014-12-02 18:17:55 +00:00
Ying Wang
2752e7d364
am 1d722cdb: am ded6640d: Merge "Don\'t set up the prebuilt apk rule twice."
...
* commit '1d722cdb36e08cf488e4047045189106b93c1f0e':
Don't set up the prebuilt apk rule twice.
2014-12-02 17:52:13 +00:00
Ying Wang
1d722cdb36
am ded6640d: Merge "Don\'t set up the prebuilt apk rule twice."
...
* commit 'ded6640d970d83cb18ce2585565c11799064f5e0':
Don't set up the prebuilt apk rule twice.
2014-12-02 17:45:44 +00:00
Ying Wang
ded6640d97
Merge "Don't set up the prebuilt apk rule twice."
2014-12-02 17:31:44 +00:00
Yohann Roussel
b4c49cba57
Compile using Jack.
...
This allows to compile dex targeted java sources using Jack and Jill.
Default is still to compile with the legacy toolchain. Default can be
switched to the new toolchain by setting environement variable:
export ANDROID_COMPILE_WITH_JACK=true
Toolchain can also be forced for one module by defining
LOCAL_USE_JACK:=true # false
in the mk portion defining the module.
Jack execution environement can be controlled with:
Global variable ANDROID_JACK_VM allow to change the jvm executing Jack.
Global variable ANDROID_JACK_VM_ARGS allows to change default args given
to the jvm.
Global variable ANDROID_JACK_EXTRA_ARGS allows to define some default args
to give to Jack
LOCAL_JACK_VM_ARGS allows to override default args given to the jvm for
the module.
LOCAL_JACK_EXTRA_ARGS allows to override default args passed to Jack.
Change-Id: Ib81a0fd5f86a51d1e0edbb81cc791d828a05dd29
2014-12-02 18:11:13 +01:00
Elliott Hughes
86e6b7ed51
Remove unused BUILD_RAW_EXECUTABLE and BUILD_RAW_STATIC_LIBRARY.
...
Change-Id: I1ba79197f3b9bb446ab34612bac8eb9485438709
2014-12-01 20:53:11 -08:00
Ying Wang
a11cf4d535
Don't set up the prebuilt apk rule twice.
...
For apps, we don't want to set up the prebuilt apk rule twice even if
"LOCAL_MULTILIB := both", which for apps really means to set up only the
jni library rules twice. See also build/core/install_jni_libs.mk.
Change-Id: Id0406c3c605c6ede613dba06178a1710590c09b3
2014-12-01 15:56:19 -08:00
Stephen Hines
1568029218
Add more support for GLOBAL_CONLYFLAGS.
...
This will be necessary to support -std=gnu99 mode for clang 3.6, which
defaults to C11 mode (unlike prior releases that use C99).
Change-Id: Iea84582f9f12ba76b988463cbc0a20bd61042538
2014-12-01 15:36:26 -08:00
smain@google.com
7fcb9209ac
am b2eaef29: am bcca18bf: am 43fbdb2a: am dc8a05ca: am 570c2210: add support for shadowbox videos with start time specified with #t= in video url
...
* commit 'b2eaef295633a3be2809c8040215f266e42d3a15':
add support for shadowbox videos with start time specified with #t= in video url
2014-12-01 19:44:27 +00:00
smain@google.com
b2eaef2956
am bcca18bf: am 43fbdb2a: am dc8a05ca: am 570c2210: add support for shadowbox videos with start time specified with #t= in video url
...
* commit 'bcca18bfd87543ff8e21d9c892b3ac31bd8de82d':
add support for shadowbox videos with start time specified with #t= in video url
2014-12-01 19:33:14 +00:00
Dan Albert
73e8a52436
am 49d06286: am 7dcbc563: Merge "Fix a typo in my_cppflags assignment."
...
* commit '49d062864b0cc4211377678ba5337acb20aa86fa':
Fix a typo in my_cppflags assignment.
2014-12-01 18:16:38 +00:00
Dan Albert
49d062864b
am 7dcbc563: Merge "Fix a typo in my_cppflags assignment."
...
* commit '7dcbc563f8811259809b754d0c0edc717e1476e6':
Fix a typo in my_cppflags assignment.
2014-12-01 18:11:05 +00:00
Dan Albert
7dcbc563f8
Merge "Fix a typo in my_cppflags assignment."
2014-12-01 17:59:45 +00:00
Dan Albert
d2fa96d7c6
Fix a typo in my_cppflags assignment.
...
Make strikes once again...
Change-Id: I295b4157fc7566b1a2cb925b06918dc0a96a7bce
2014-11-28 14:00:12 -08:00
smain@google.com
bcca18bfd8
am 43fbdb2a: am dc8a05ca: am 570c2210: add support for shadowbox videos with start time specified with #t= in video url
...
* commit '43fbdb2acb8e4e673d963630acbc32ab2717139c':
add support for shadowbox videos with start time specified with #t= in video url
2014-11-27 10:19:35 +00:00
smain@google.com
43fbdb2acb
am dc8a05ca: am 570c2210: add support for shadowbox videos with start time specified with #t= in video url
...
* commit 'dc8a05ca6922642851f93889f90052765a8a2fb6':
add support for shadowbox videos with start time specified with #t= in video url
2014-11-27 10:08:54 +00:00
Clay Murphy
6da0217fc3
Merge "Docs: Updating the PDK for the L release."
2014-11-26 22:05:25 +00:00
smain@google.com
1ed2f9e26b
am 8051e8b6: am 78860124: am d020c517: am 39343e30: am ccb54008: rev css version to clear browser caches
...
* commit '8051e8b6622fc984364668468d12c529cfb07cbf':
rev css version to clear browser caches
2014-11-26 19:59:01 +00:00
smain@google.com
ecd25aaba7
am 99114f48: am 42abb5fc: am 17874347: am b90e4792: am 3a9d50e1: move the next/previous links in design docs up 25px to avoid overlap with long titles
...
* commit '99114f48796ae540ef29066989add021deafe0ff':
move the next/previous links in design docs up 25px to avoid overlap with long titles
2014-11-26 19:59:00 +00:00
smain@google.com
8051e8b662
am 78860124: am d020c517: am 39343e30: am ccb54008: rev css version to clear browser caches
...
* commit '788601245a41067f7f300357925ac7f2d92e86b2':
rev css version to clear browser caches
2014-11-26 18:42:36 +00:00
smain@google.com
99114f4879
am 42abb5fc: am 17874347: am b90e4792: am 3a9d50e1: move the next/previous links in design docs up 25px to avoid overlap with long titles
...
* commit '42abb5fc564e2735dff568d1833e23507e485564':
move the next/previous links in design docs up 25px to avoid overlap with long titles
2014-11-26 18:42:35 +00:00
Roozbeh Pournader
7096d8a0a1
am f901b699: am bceaa7f1: am 35e7c067: Add Lohit fonts to the build.
...
* commit 'f901b699a620936f8499209f7f9f79127c99d141':
Add Lohit fonts to the build.
2014-11-26 18:10:12 +00:00
Roozbeh Pournader
f901b699a6
am bceaa7f1: am 35e7c067: Add Lohit fonts to the build.
...
* commit 'bceaa7f1ae1aaa64935077469c72b0c96a1ceed9':
Add Lohit fonts to the build.
2014-11-26 18:01:06 +00:00
smain@google.com
dc8a05ca69
am 570c2210: add support for shadowbox videos with start time specified with #t= in video url
...
* commit '570c2210b8ea16cc560e6b62ec06f8ad05fae9aa':
add support for shadowbox videos with start time specified with #t= in video url
2014-11-26 11:56:55 +00:00
Scott Main
21a1981389
Merge "docs: sdkpage update"
2014-11-26 03:14:15 +00:00
smain@google.com
570c2210b8
add support for shadowbox videos with start time specified with #t= in video url
...
Change-Id: I165620326f44f8e95bb34a2b623e67fc3b7dcc50
2014-11-25 19:03:56 -08:00
smain@google.com
788601245a
am d020c517: am 39343e30: am ccb54008: rev css version to clear browser caches
...
* commit 'd020c51752611b8b647db9dad94519e5514fc66f':
rev css version to clear browser caches
2014-11-26 01:46:20 +00:00
smain@google.com
42abb5fc56
am 17874347: am b90e4792: am 3a9d50e1: move the next/previous links in design docs up 25px to avoid overlap with long titles
...
* commit '17874347cc72e88bb318057bca01d36a47dfc5e4':
move the next/previous links in design docs up 25px to avoid overlap with long titles
2014-11-26 01:46:18 +00:00
smain@google.com
d020c51752
am 39343e30: am ccb54008: rev css version to clear browser caches
...
* commit '39343e30796d4fbf3d6daa5869acdb71a9fb3a87':
rev css version to clear browser caches
2014-11-26 00:59:47 +00:00
smain@google.com
17874347cc
am b90e4792: am 3a9d50e1: move the next/previous links in design docs up 25px to avoid overlap with long titles
...
* commit 'b90e4792dea4271395e216a9d37c712572395003':
move the next/previous links in design docs up 25px to avoid overlap with long titles
2014-11-26 00:59:42 +00:00
smain@google.com
39343e3079
am ccb54008: rev css version to clear browser caches
...
* commit 'ccb540081ca5f1c69bb1b2721cab319b88f9dd94':
rev css version to clear browser caches
2014-11-26 00:31:57 +00:00
Elliott Hughes
1192e2d1aa
am 1609e07a: am 65a36e0f: Merge "Remove HAVE_SYS_UIO_H."
...
* commit '1609e07aa5334d3fcbf9b876b1eca631f47cd5bf':
Remove HAVE_SYS_UIO_H.
2014-11-26 00:29:02 +00:00
smain@google.com
b90e4792de
am 3a9d50e1: move the next/previous links in design docs up 25px to avoid overlap with long titles
...
* commit '3a9d50e19d9789cffc0d3d398733d909ee2ee618':
move the next/previous links in design docs up 25px to avoid overlap with long titles
2014-11-26 00:27:58 +00:00
Elliott Hughes
1609e07aa5
am 65a36e0f: Merge "Remove HAVE_SYS_UIO_H."
...
* commit '65a36e0fa0701cd834242d628d87b02bd0bbe611':
Remove HAVE_SYS_UIO_H.
2014-11-26 00:24:58 +00:00
smain@google.com
ccb540081c
rev css version to clear browser caches
...
Change-Id: I46e04a02a0c010777ba01af28044999a1cbe1e10
2014-11-25 16:16:20 -08:00
Elliott Hughes
65a36e0fa0
Merge "Remove HAVE_SYS_UIO_H."
2014-11-26 00:15:36 +00:00
Roozbeh Pournader
bceaa7f1ae
am 35e7c067: Add Lohit fonts to the build.
...
* commit '35e7c067b88c4904d6a57b3bff64410ba0a3ecf3':
Add Lohit fonts to the build.
2014-11-25 22:33:07 +00:00