OSDN Git Service
smain@google.com [Tue, 9 Dec 2014 23:03:29 +0000 (23:03 +0000)]
am
5d48286c: am
30aea34e: am
07c19f68: am
87b1b5ed: am
102db8b5: update sdk template with new studio downloads
* commit '
5d48286c01a407c56d6fc13d666d7ead70e0d2a1':
update sdk template with new studio downloads
smain@google.com [Tue, 9 Dec 2014 23:03:28 +0000 (23:03 +0000)]
am
f0a2e5eb: am
a324f898: am
3984cca2: am
79ac4384: am
d53f0660: update to sdk page template for Android Studio downloads
* commit '
f0a2e5eb86512ae792af7fb3a93667531635c5f9':
update to sdk page template for Android Studio downloads
Rich Slogar [Tue, 9 Dec 2014 23:03:27 +0000 (23:03 +0000)]
am
0e41ac78: (-s ours) am
2305c8d9: am
8242ce83: am
db8d79a9: am
fe4dd526: docs: sdkpage update [CP]
* commit '
0e41ac78037c581da6315be7f27f28b589975356':
docs: sdkpage update [CP]
Ying Wang [Tue, 9 Dec 2014 00:56:58 +0000 (00:56 +0000)]
am
c6f3273d: am
be66d9f0: am
27eba54b: Add system propery ro.build.flavor.
* commit '
c6f3273db3fe5c09a93fa04e49c52d89a322d1b3':
Add system propery ro.build.flavor.
Ed Heyl [Mon, 8 Dec 2014 20:28:41 +0000 (20:28 +0000)]
smain@google.com [Mon, 8 Dec 2014 19:41:31 +0000 (19:41 +0000)]
am
30aea34e: am
07c19f68: am
87b1b5ed: am
102db8b5: update sdk template with new studio downloads
* commit '
30aea34eaed65032675c448be3534a070e1910b6':
update sdk template with new studio downloads
smain@google.com [Mon, 8 Dec 2014 19:39:57 +0000 (19:39 +0000)]
am
a324f898: am
3984cca2: am
79ac4384: am
d53f0660: update to sdk page template for Android Studio downloads
* commit '
a324f898ccca57879e7478c1bbe0411533dcfbd9':
update to sdk page template for Android Studio downloads
Rich Slogar [Mon, 8 Dec 2014 19:39:49 +0000 (19:39 +0000)]
am
2305c8d9: am
8242ce83: am
db8d79a9: am
fe4dd526: docs: sdkpage update [CP]
* commit '
2305c8d90c0fe0e57e4d0332749366ba5acde1a0':
docs: sdkpage update [CP]
Ying Wang [Mon, 8 Dec 2014 19:12:15 +0000 (19:12 +0000)]
am
be66d9f0: am
27eba54b: Add system propery ro.build.flavor.
* commit '
be66d9f09ada756a95a9efd3b67040a81b3322d1':
Add system propery ro.build.flavor.
Ed Heyl [Mon, 8 Dec 2014 18:53:50 +0000 (10:53 -0800)]
resolve conflicts w/
aaf823d2
Change-Id: I7c5cf1d1e074a67bdd19a7cf51f45e5f3e026c84
smain@google.com [Mon, 8 Dec 2014 07:24:39 +0000 (07:24 +0000)]
am
07c19f68: am
87b1b5ed: am
102db8b5: update sdk template with new studio downloads
* commit '
07c19f688866715c6c30d8d8d58a7a9fa9a47d00':
update sdk template with new studio downloads
smain@google.com [Mon, 8 Dec 2014 07:17:54 +0000 (07:17 +0000)]
am
87b1b5ed: am
102db8b5: update sdk template with new studio downloads
* commit '
87b1b5edb11644ac656a1d8df37201460289de94':
update sdk template with new studio downloads
smain@google.com [Mon, 8 Dec 2014 07:10:39 +0000 (07:10 +0000)]
am
102db8b5: update sdk template with new studio downloads
* commit '
102db8b58bd51aeaa7409924d5dc341f2f72b892':
update sdk template with new studio downloads
smain@google.com [Mon, 8 Dec 2014 06:39:24 +0000 (22:39 -0800)]
update sdk template with new studio downloads
Change-Id: Iee43f4f4eb5c63d94884a463a73fc016b5a05c4e
smain@google.com [Mon, 8 Dec 2014 03:59:56 +0000 (03:59 +0000)]
am
3984cca2: am
79ac4384: am
d53f0660: update to sdk page template for Android Studio downloads
* commit '
3984cca2a617bad37dc54885efbf86bc49b9c4f2':
update to sdk page template for Android Studio downloads
smain@google.com [Mon, 8 Dec 2014 03:53:00 +0000 (03:53 +0000)]
am
79ac4384: am
d53f0660: update to sdk page template for Android Studio downloads
* commit '
79ac4384637c77076f93307e61c8e2612df4a8cc':
update to sdk page template for Android Studio downloads
smain@google.com [Mon, 8 Dec 2014 03:46:13 +0000 (03:46 +0000)]
am
d53f0660: update to sdk page template for Android Studio downloads
* commit '
d53f0660f1fe40921d72b75abb9bfeee534b6b8c':
update to sdk page template for Android Studio downloads
smain@google.com [Thu, 4 Dec 2014 03:34:55 +0000 (19:34 -0800)]
update to sdk page template for Android Studio downloads
Change-Id: I729a1238a97909d4087f7396cc478a5aea0c43cd
(cherry picked from commit
85fd6240cfc2a395d3189a87214813b1568b0122)
Rich Slogar [Mon, 8 Dec 2014 03:10:15 +0000 (03:10 +0000)]
am
8242ce83: am
db8d79a9: am
fe4dd526: docs: sdkpage update [CP]
* commit '
8242ce83d1181e71eb6b417cc58d5bcdc181c927':
docs: sdkpage update [CP]
Rich Slogar [Mon, 8 Dec 2014 03:03:49 +0000 (03:03 +0000)]
am
db8d79a9: am
fe4dd526: docs: sdkpage update [CP]
* commit '
db8d79a9efefa4ba03a311904c4bf3b850f4f52b':
docs: sdkpage update [CP]
Rich Slogar [Mon, 8 Dec 2014 02:59:48 +0000 (02:59 +0000)]
am
fe4dd526: docs: sdkpage update [CP]
* commit '
fe4dd5263f344c5420780626410b84d7383e801d':
docs: sdkpage update [CP]
Rich Slogar [Mon, 3 Nov 2014 23:16:34 +0000 (15:16 -0800)]
docs: sdkpage update [CP]
Change-Id: I06c8878c4b449a472a71f224a17bf9fef794de20
(cherry picked from commit
627f711a5dad6b0878576a169c5601f41a083aba)
Rong Xu [Fri, 5 Dec 2014 19:29:44 +0000 (19:29 +0000)]
am
69b8c4f9: am
37979c57: Merge "Upgrade gcc compiler for arm build from 4.8 to 4.9"
* commit '
69b8c4f9314e6c48dde64a234b2f4b25500abb36':
Upgrade gcc compiler for arm build from 4.8 to 4.9
Elliott Hughes [Fri, 5 Dec 2014 19:25:57 +0000 (19:25 +0000)]
am
89b56de1: am
8298ddb0: Merge "bionic doesn\'t implement _FILE_OFFSET_BITS."
* commit '
89b56de1904a2f72e81390d6758162dec6797bb9':
bionic doesn't implement _FILE_OFFSET_BITS.
Elliott Hughes [Fri, 5 Dec 2014 19:25:56 +0000 (19:25 +0000)]
am
1ac5626e: am
e9d1d7ad: Merge "Darwin has never had a 32-bit off_t."
* commit '
1ac5626ef6d6dddabac05f1d992f1fb62797bfd3':
Darwin has never had a 32-bit off_t.
Rong Xu [Fri, 5 Dec 2014 19:24:18 +0000 (19:24 +0000)]
am
37979c57: Merge "Upgrade gcc compiler for arm build from 4.8 to 4.9"
* commit '
37979c5749bfa516094080f9e8a5c0f387273c5b':
Upgrade gcc compiler for arm build from 4.8 to 4.9
Elliott Hughes [Fri, 5 Dec 2014 19:20:31 +0000 (19:20 +0000)]
am
8298ddb0: Merge "bionic doesn\'t implement _FILE_OFFSET_BITS."
* commit '
8298ddb0e5feee49fd35fa26ecfaf2a541af7d0f':
bionic doesn't implement _FILE_OFFSET_BITS.
Elliott Hughes [Fri, 5 Dec 2014 19:20:30 +0000 (19:20 +0000)]
am
e9d1d7ad: Merge "Darwin has never had a 32-bit off_t."
* commit '
e9d1d7adcf6473d4f3fce59f855772a7f9d3746b':
Darwin has never had a 32-bit off_t.
Elliott Hughes [Fri, 5 Dec 2014 19:16:31 +0000 (19:16 +0000)]
am
451caf92: am
c7296b6f: Merge "Remove ARCH_X86."
* commit '
451caf92678ab03834a86c13651a287abce15455':
Remove ARCH_X86.
Elliott Hughes [Fri, 5 Dec 2014 19:16:30 +0000 (19:16 +0000)]
am
2e4e4acb: am
9658bda3: Merge "Remove ARCH_ARM."
* commit '
2e4e4acbf0f84a32fc4ccb97bd7ef1da74f86f01':
Remove ARCH_ARM.
Rong Xu [Fri, 5 Dec 2014 19:14:15 +0000 (19:14 +0000)]
Merge "Upgrade gcc compiler for arm build from 4.8 to 4.9"
Elliott Hughes [Fri, 5 Dec 2014 19:08:57 +0000 (19:08 +0000)]
am
c7296b6f: Merge "Remove ARCH_X86."
* commit '
c7296b6f100fff7ab21fb1f512e9f230f4cae048':
Remove ARCH_X86.
Elliott Hughes [Fri, 5 Dec 2014 19:08:55 +0000 (19:08 +0000)]
am
9658bda3: Merge "Remove ARCH_ARM."
* commit '
9658bda351e8e9226181b411eeb14b5cc3618471':
Remove ARCH_ARM.
Elliott Hughes [Fri, 5 Dec 2014 19:05:42 +0000 (19:05 +0000)]
Merge "bionic doesn't implement _FILE_OFFSET_BITS."
Elliott Hughes [Fri, 5 Dec 2014 19:05:03 +0000 (19:05 +0000)]
Merge "Darwin has never had a 32-bit off_t."
Elliott Hughes [Fri, 5 Dec 2014 19:03:56 +0000 (11:03 -0800)]
Darwin has never had a 32-bit off_t.
Change-Id: Ifa48fab99d73fb532afc56d235b7397e05c0fc6a
Elliott Hughes [Fri, 5 Dec 2014 19:01:43 +0000 (11:01 -0800)]
bionic doesn't implement _FILE_OFFSET_BITS.
Change-Id: Iec9978e0bb69585dde69593402d53309e0ecb662
Elliott Hughes [Fri, 5 Dec 2014 18:57:28 +0000 (18:57 +0000)]
Merge "Remove ARCH_X86."
Elliott Hughes [Fri, 5 Dec 2014 18:55:19 +0000 (18:55 +0000)]
Merge "Remove ARCH_ARM."
Rong Xu [Thu, 4 Dec 2014 00:27:20 +0000 (16:27 -0800)]
Upgrade gcc compiler for arm build from 4.8 to 4.9
Change-Id: Id85c56452a478ea94bdb6ea2b990c3b46a81eed9
smain@google.com [Fri, 5 Dec 2014 18:28:55 +0000 (18:28 +0000)]
Merge "update to sdk page template for Android Studio downloads"
smain@google.com [Thu, 4 Dec 2014 03:34:55 +0000 (19:34 -0800)]
update to sdk page template for Android Studio downloads
Change-Id: I729a1238a97909d4087f7396cc478a5aea0c43cd
Ying Wang [Fri, 5 Dec 2014 00:42:02 +0000 (00:42 +0000)]
am
27eba54b: Add system propery ro.build.flavor.
* commit '
27eba54b20e1f1d597a979be1469b62dd262aecb':
Add system propery ro.build.flavor.
Elliott Hughes [Fri, 5 Dec 2014 00:39:30 +0000 (16:39 -0800)]
Remove ARCH_X86.
Change-Id: I832247bec22f23666f14dfb715192ada201ab097
Elliott Hughes [Fri, 5 Dec 2014 00:29:20 +0000 (16:29 -0800)]
Remove ARCH_ARM.
Change-Id: Ic3014aa01f82204b75c54ab3f7afa3a44890e02e
Adam Lesinski [Fri, 5 Dec 2014 00:13:49 +0000 (00:13 +0000)]
am
82a033f8: am
c2b74b87: am
57a3d3e1: Merge "Remove uses of density in PRODUCT_AAP_CONFIG" into lmp-mr1-dev
* commit '
82a033f89c257ad72dbf175c3f145ae676958d87':
Remove uses of density in PRODUCT_AAP_CONFIG
Ying Wang [Thu, 4 Dec 2014 23:19:08 +0000 (15:19 -0800)]
Add system propery ro.build.flavor.
ro.build.flavor is set to "$(TARGET_PRODUCT)-$(TARGET_BUILD_VARIANT)" in
system.img build.prop at build time,
and it won't be overridden by oem partition's build.prop.
Bug:
18605832
Change-Id: Ic917623dd43b74d9c601119db0b457483e8c4472
Dianne Hackborn [Thu, 4 Dec 2014 22:07:08 +0000 (22:07 +0000)]
am
0421d0b1: Fix issue #
18368417: 5.0 -> 5.1.
* commit '
0421d0b115208b50015781b09f3661b65d72e858':
Fix issue #
18368417: 5.0 -> 5.1.
Adam Lesinski [Thu, 4 Dec 2014 21:46:56 +0000 (21:46 +0000)]
am
c2b74b87: am
57a3d3e1: Merge "Remove uses of density in PRODUCT_AAP_CONFIG" into lmp-mr1-dev
* commit '
c2b74b87d4ea4bcdef228080a874bad4aca7c323':
Remove uses of density in PRODUCT_AAP_CONFIG
Dianne Hackborn [Thu, 4 Dec 2014 20:10:32 +0000 (12:10 -0800)]
Fix issue #
18368417: 5.0 -> 5.1.
Change-Id: Icd7137fe8b1bda1c5aaf170aa7b19a58832144c8
Stephen Hines [Thu, 4 Dec 2014 19:59:40 +0000 (19:59 +0000)]
am
3ab4ba1d: am
ea4f39e8: Merge "Switch to Clang 3.6."
* commit '
3ab4ba1dff0dac72e938a710db7bb0860fe1ab0a':
Switch to Clang 3.6.
Stephen Hines [Thu, 4 Dec 2014 19:51:36 +0000 (19:51 +0000)]
am
ea4f39e8: Merge "Switch to Clang 3.6."
* commit '
ea4f39e86d315793390fb84b5b4d667aa4d3917b':
Switch to Clang 3.6.
Elliott Hughes [Thu, 4 Dec 2014 16:17:17 +0000 (16:17 +0000)]
am
eae211ba: am
b919da4c: Merge "Rename core/combo/arch/x86/x86-atom.mk to core/combo/arch/x86/atom.mk."
* commit '
eae211ba7b709716833e2f10421e0e6e1bd53926':
Rename core/combo/arch/x86/x86-atom.mk to core/combo/arch/x86/atom.mk.
Adam Lesinski [Thu, 4 Dec 2014 15:17:20 +0000 (15:17 +0000)]
am
57a3d3e1: Merge "Remove uses of density in PRODUCT_AAP_CONFIG" into lmp-mr1-dev
* commit '
57a3d3e1f48f1719fdead0b13495230d772955b4':
Remove uses of density in PRODUCT_AAP_CONFIG
Yohann Roussel [Thu, 4 Dec 2014 09:27:11 +0000 (09:27 +0000)]
Merge "Compile using Jack."
Elliott Hughes [Thu, 4 Dec 2014 09:22:16 +0000 (09:22 +0000)]
am
b919da4c: Merge "Rename core/combo/arch/x86/x86-atom.mk to core/combo/arch/x86/atom.mk."
* commit '
b919da4c6267cd139e8b3c41db921e1f61ad4c50':
Rename core/combo/arch/x86/x86-atom.mk to core/combo/arch/x86/atom.mk.
Stephen Hines [Thu, 4 Dec 2014 02:59:20 +0000 (02:59 +0000)]
Merge "Switch to Clang 3.6."
Adam Lesinski [Wed, 3 Dec 2014 23:29:16 +0000 (23:29 +0000)]
Merge "Remove uses of density in PRODUCT_AAP_CONFIG" into lmp-mr1-dev
Adam Lesinski [Wed, 3 Dec 2014 00:13:09 +0000 (16:13 -0800)]
Remove uses of density in PRODUCT_AAP_CONFIG
Change-Id: I98594165515c07fa2e6b847266f7d8fa3283b52e
Stephen Hines [Wed, 26 Nov 2014 08:57:34 +0000 (00:57 -0800)]
Switch to Clang 3.6.
This change also defaults C compilations with clang to gnu99, and turns off
the -Winconsistent-missing-override flag, since we need further cleanup to
turn it on. -finline-functions is an unnecessary flag that only gcc needs.
Change-Id: I1cfcaedca32d9e3c248a6aa9460603205901c491
smain@google.com [Wed, 3 Dec 2014 21:51:53 +0000 (21:51 +0000)]
am
02af9d6d: am
b8e8e522: am
e217fc3c: am
eee91eb2: am
d99989c5: Merge "new version of Helpouts recruit banner for TV and Wear" into lmp-docs
* commit '
02af9d6dfdb1dcd35f3291d2a931265b886c57ad':
new version of Helpouts recruit banner for TV and Wear
smain@google.com [Wed, 3 Dec 2014 20:43:06 +0000 (20:43 +0000)]
am
b8e8e522: am
e217fc3c: am
eee91eb2: am
d99989c5: Merge "new version of Helpouts recruit banner for TV and Wear" into lmp-docs
* commit '
b8e8e522704f37ea5adc63cce9c34801bb10c42d':
new version of Helpouts recruit banner for TV and Wear
Elliott Hughes [Wed, 3 Dec 2014 20:09:38 +0000 (20:09 +0000)]
Merge "Rename core/combo/arch/x86/x86-atom.mk to core/combo/arch/x86/atom.mk."
Alexander Ivchenko [Wed, 3 Dec 2014 14:00:21 +0000 (17:00 +0300)]
Rename core/combo/arch/x86/x86-atom.mk to core/combo/arch/x86/atom.mk.
Otherwise wrong set of memory/string functions is chosen when building atom
image (in Bionic we have libc/arch-x86/atom/atom.mk). Plus this naming is
consistent with other x86 architectures.
Change-Id: I21e899534e7ce10530474a22ceba770422b39d8d
Signed-off-by: Alexander Ivchenko <alexander.ivchenko@intel.com>
smain@google.com [Wed, 3 Dec 2014 18:36:34 +0000 (18:36 +0000)]
am
e217fc3c: am
eee91eb2: am
d99989c5: Merge "new version of Helpouts recruit banner for TV and Wear" into lmp-docs
* commit '
e217fc3c3ee9a437dfdeda2c3cc0df99380dbfc0':
new version of Helpouts recruit banner for TV and Wear
smain@google.com [Wed, 3 Dec 2014 18:12:41 +0000 (18:12 +0000)]
am
eee91eb2: am
d99989c5: Merge "new version of Helpouts recruit banner for TV and Wear" into lmp-docs
* commit '
eee91eb24233fa0a14f2d273bebd18a4bcb87310':
new version of Helpouts recruit banner for TV and Wear
smain@google.com [Wed, 3 Dec 2014 03:04:49 +0000 (03:04 +0000)]
am
d99989c5: Merge "new version of Helpouts recruit banner for TV and Wear" into lmp-docs
* commit '
d99989c558c384312bd63cf3a5e1bbbd799bf4b5':
new version of Helpouts recruit banner for TV and Wear
smain@google.com [Wed, 3 Dec 2014 02:23:10 +0000 (02:23 +0000)]
Merge "new version of Helpouts recruit banner for TV and Wear" into lmp-docs
Stephen Hines [Wed, 3 Dec 2014 00:29:48 +0000 (00:29 +0000)]
am
78706f91: am
0db9ea92: Merge "Fix a preprocessor warning exposed by -Wundef."
* commit '
78706f9149b2513bd71672aaa651cd8855088fe3':
Fix a preprocessor warning exposed by -Wundef.
Stephen Hines [Tue, 2 Dec 2014 22:00:35 +0000 (22:00 +0000)]
am
0db9ea92: Merge "Fix a preprocessor warning exposed by -Wundef."
* commit '
0db9ea923309f514a3216826593b325cffcfbbbf':
Fix a preprocessor warning exposed by -Wundef.
Stephen Hines [Tue, 2 Dec 2014 19:25:18 +0000 (19:25 +0000)]
Merge "Fix a preprocessor warning exposed by -Wundef."
Stephen Hines [Tue, 2 Dec 2014 19:17:07 +0000 (11:17 -0800)]
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
Ying Wang [Tue, 2 Dec 2014 19:05:27 +0000 (19:05 +0000)]
am
f5d6b367: am
b60408bb: am
8070b20f: Support to build dpi-specific apk variants.
* commit '
f5d6b36748d266ca3198f09c2327f66d60696860':
Support to build dpi-specific apk variants.
Elliott Hughes [Tue, 2 Dec 2014 19:01:42 +0000 (19:01 +0000)]
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.
Stephen Hines [Tue, 2 Dec 2014 19:01:41 +0000 (19:01 +0000)]
am
b2f55103: am
4bad2d21: Merge "Add more support for GLOBAL_CONLYFLAGS."
* commit '
b2f5510365be26e279a8d02770a9f46e57741d54':
Add more support for GLOBAL_CONLYFLAGS.
smain@google.com [Tue, 2 Dec 2014 19:01:20 +0000 (11:01 -0800)]
new version of Helpouts recruit banner for TV and Wear
Change-Id: I971e9043b60bdb925c2f648e0aff3de9d8c9cd81
Ying Wang [Tue, 2 Dec 2014 18:54:35 +0000 (18:54 +0000)]
am
b60408bb: am
8070b20f: Support to build dpi-specific apk variants.
* commit '
b60408bb53a4a63cd186c5bedfded90856b60d73':
Support to build dpi-specific apk variants.
Elliott Hughes [Tue, 2 Dec 2014 18:52:13 +0000 (18:52 +0000)]
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.
Stephen Hines [Tue, 2 Dec 2014 18:52:12 +0000 (18:52 +0000)]
am
4bad2d21: Merge "Add more support for GLOBAL_CONLYFLAGS."
* commit '
4bad2d2156bcb589c2d1bb223a074edc39aa428c':
Add more support for GLOBAL_CONLYFLAGS.
Ying Wang [Tue, 2 Dec 2014 18:45:55 +0000 (18:45 +0000)]
am
8070b20f: Support to build dpi-specific apk variants.
* commit '
8070b20f9ec899a5dc27c7589f11c6db8c72180a':
Support to build dpi-specific apk variants.
Elliott Hughes [Tue, 2 Dec 2014 18:42:23 +0000 (18:42 +0000)]
Merge "Remove unused BUILD_RAW_EXECUTABLE and BUILD_RAW_STATIC_LIBRARY."
Stephen Hines [Tue, 2 Dec 2014 18:35:17 +0000 (18:35 +0000)]
Merge "Add more support for GLOBAL_CONLYFLAGS."
Ying Wang [Tue, 2 Dec 2014 01:46:56 +0000 (17:46 -0800)]
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
Ying Wang [Tue, 2 Dec 2014 17:52:13 +0000 (17:52 +0000)]
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.
Ying Wang [Tue, 2 Dec 2014 17:45:44 +0000 (17:45 +0000)]
am
ded6640d: Merge "Don\'t set up the prebuilt apk rule twice."
* commit '
ded6640d970d83cb18ce2585565c11799064f5e0':
Don't set up the prebuilt apk rule twice.
Ying Wang [Tue, 2 Dec 2014 17:31:44 +0000 (17:31 +0000)]
Merge "Don't set up the prebuilt apk rule twice."
Yohann Roussel [Mon, 8 Sep 2014 12:45:14 +0000 (14:45 +0200)]
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
Elliott Hughes [Tue, 2 Dec 2014 04:53:11 +0000 (20:53 -0800)]
Remove unused BUILD_RAW_EXECUTABLE and BUILD_RAW_STATIC_LIBRARY.
Change-Id: I1ba79197f3b9bb446ab34612bac8eb9485438709
Ying Wang [Mon, 1 Dec 2014 23:56:19 +0000 (15:56 -0800)]
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
Stephen Hines [Wed, 26 Nov 2014 08:53:46 +0000 (00:53 -0800)]
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
smain@google.com [Mon, 1 Dec 2014 19:44:27 +0000 (19:44 +0000)]
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
smain@google.com [Mon, 1 Dec 2014 19:33:14 +0000 (19:33 +0000)]
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
Dan Albert [Mon, 1 Dec 2014 18:16:38 +0000 (18:16 +0000)]
am
49d06286: am
7dcbc563: Merge "Fix a typo in my_cppflags assignment."
* commit '
49d062864b0cc4211377678ba5337acb20aa86fa':
Fix a typo in my_cppflags assignment.
Dan Albert [Mon, 1 Dec 2014 18:11:05 +0000 (18:11 +0000)]
am
7dcbc563: Merge "Fix a typo in my_cppflags assignment."
* commit '
7dcbc563f8811259809b754d0c0edc717e1476e6':
Fix a typo in my_cppflags assignment.
Dan Albert [Mon, 1 Dec 2014 17:59:44 +0000 (17:59 +0000)]
Merge "Fix a typo in my_cppflags assignment."
Dan Albert [Fri, 28 Nov 2014 22:00:12 +0000 (14:00 -0800)]
Fix a typo in my_cppflags assignment.
Make strikes once again...
Change-Id: I295b4157fc7566b1a2cb925b06918dc0a96a7bce
smain@google.com [Thu, 27 Nov 2014 10:19:35 +0000 (10:19 +0000)]
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
smain@google.com [Thu, 27 Nov 2014 10:08:54 +0000 (10:08 +0000)]
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
Clay Murphy [Wed, 26 Nov 2014 22:05:25 +0000 (22:05 +0000)]
Merge "Docs: Updating the PDK for the L release."
smain@google.com [Wed, 26 Nov 2014 19:59:01 +0000 (19:59 +0000)]
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
OSDN Git Service
