OSDN Git Service
Elliott Hughes [Sat, 13 Dec 2014 18:59:39 +0000 (18:59 +0000)]
am
55e21af2: Merge "Remove unused OS_SHARED_LIB_FORMAT_STR."
* commit '
55e21af2079b7f44b7aa70d8ba08075e8a79ff38':
Remove unused OS_SHARED_LIB_FORMAT_STR.
Elliott Hughes [Sat, 13 Dec 2014 18:51:23 +0000 (18:51 +0000)]
Merge "Remove unused OS_SHARED_LIB_FORMAT_STR."
Elliott Hughes [Fri, 12 Dec 2014 23:54:56 +0000 (15:54 -0800)]
Remove unused OS_SHARED_LIB_FORMAT_STR.
Change-Id: Ibaaf112c5a6bfe2084fe34e32e31bcd755e718a8
Dianne Hackborn [Fri, 12 Dec 2014 14:42:11 +0000 (14:42 +0000)]
am
c5fd92a3: am
423854bf: am
934b04d3: (-s ours) am
27fad66a: Merge "DO NOT MERGE. Bump version to 5.0.2." into lmp-dev
* commit '
c5fd92a3ea7bbb93701e9c322434dabaa6b8e787':
DO NOT MERGE. Bump version to 5.0.2.
Dianne Hackborn [Fri, 12 Dec 2014 00:26:01 +0000 (00:26 +0000)]
am
423854bf: am
934b04d3: (-s ours) am
27fad66a: Merge "DO NOT MERGE. Bump version to 5.0.2." into lmp-dev
* commit '
423854bfb99eb274e0e8adb3a3c344ae15905ae6':
DO NOT MERGE. Bump version to 5.0.2.
Dianne Hackborn [Fri, 12 Dec 2014 00:19:51 +0000 (00:19 +0000)]
am
934b04d3: (-s ours) am
27fad66a: Merge "DO NOT MERGE. Bump version to 5.0.2." into lmp-dev
* commit '
934b04d3767974934d3d2e90e6196955f5b83d0c':
DO NOT MERGE. Bump version to 5.0.2.
Dianne Hackborn [Thu, 11 Dec 2014 22:29:46 +0000 (22:29 +0000)]
am
27fad66a: Merge "DO NOT MERGE. Bump version to 5.0.2." into lmp-dev
* commit '
27fad66a8c730e58b3f2aab56edc8c6078b4283e':
DO NOT MERGE. Bump version to 5.0.2.
Dianne Hackborn [Thu, 11 Dec 2014 22:25:31 +0000 (22:25 +0000)]
Merge "DO NOT MERGE. Bump version to 5.0.2." into lmp-dev
Dianne Hackborn [Thu, 11 Dec 2014 22:04:55 +0000 (14:04 -0800)]
DO NOT MERGE. Bump version to 5.0.2.
Change-Id: Ia6426dd03ac3b51061429b7da36e317bd3503775
Ying Wang [Thu, 11 Dec 2014 00:07:38 +0000 (00:07 +0000)]
am
18eee18e: am
60686586: Add product variable PRODUCT_AAPT_PREBUILT_DPI
* commit '
18eee18e6e51da4857054376ad96add16c0c0b92':
Add product variable PRODUCT_AAPT_PREBUILT_DPI
Ying Wang [Wed, 10 Dec 2014 22:36:49 +0000 (22:36 +0000)]
am
8750cfc5: am
111ba923: Bump generic_arm64 system partition size to 900M.
* commit '
8750cfc5b5af821c90b224e727729e721c981e78':
Bump generic_arm64 system partition size to 900M.
Ying Wang [Wed, 10 Dec 2014 22:19:49 +0000 (22:19 +0000)]
am
60686586: Add product variable PRODUCT_AAPT_PREBUILT_DPI
* commit '
60686586a5f9c8f78b9ad16e19782da85e89a760':
Add product variable PRODUCT_AAPT_PREBUILT_DPI
Ying Wang [Wed, 10 Dec 2014 20:40:09 +0000 (12:40 -0800)]
Add product variable PRODUCT_AAPT_PREBUILT_DPI
We use search LOCAL_DPI_VARIANTS in the list of
"$(PRODUCT_AAPT_PREF_CONFIG) $(PRODUCT_AAPT_PREBUILT_DPI)"
and the first takes precedence.
That way if we don't have a best match, we fall back to the second best,
the way how it worked with PRODUCT_AAPT_CONFIG previously.
Bug:
18388705
Change-Id: I8bd646c52215c65cc6e38c728857af9b64d13469
Ying Wang [Wed, 10 Dec 2014 18:52:51 +0000 (18:52 +0000)]
am
111ba923: Bump generic_arm64 system partition size to 900M.
* commit '
111ba923bec7e99d3ee49688f7ad426b760f8b36':
Bump generic_arm64 system partition size to 900M.
Ying Wang [Wed, 10 Dec 2014 17:56:06 +0000 (09:56 -0800)]
Bump generic_arm64 system partition size to 900M.
This fixes the arm64 sdk build.
Change-Id: Ic7b7ada79027845974cbcfc68941cfc87ed050fd
smain@google.com [Tue, 9 Dec 2014 23:15:06 +0000 (23:15 +0000)]
am
425aa9f9: am
79ad9c78: am
8aebbf0d: am
0ecb5a68: add links to release notes
* commit '
425aa9f99ba73cea3d469727d5eb446eeb43d0c9':
add links to release notes
David Friedman [Tue, 9 Dec 2014 23:15:05 +0000 (23:15 +0000)]
am
13c3e7eb: am
03e066b7: am
83e96ca8: am
1a0159f2: Merge "CSS change changing default from "Using Eclipse" to "Using Android Studio" Bug
16679117" into lmp-docs
* commit '
13c3e7eb90ea8b2bed230dd91e79b0e3403c59fb':
CSS change changing default from "Using Eclipse" to "Using Android Studio" Bug
16679117
smain@google.com [Tue, 9 Dec 2014 22:20:22 +0000 (22:20 +0000)]
am
79ad9c78: am
8aebbf0d: am
0ecb5a68: add links to release notes
* commit '
79ad9c786a33f9f433fd943f87a2c8b1975e89a5':
add links to release notes
David Friedman [Tue, 9 Dec 2014 22:20:21 +0000 (22:20 +0000)]
am
03e066b7: am
83e96ca8: am
1a0159f2: Merge "CSS change changing default from "Using Eclipse" to "Using Android Studio" Bug
16679117" into lmp-docs
* commit '
03e066b75936c5f93d79b2912972ee6b6d760c1a':
CSS change changing default from "Using Eclipse" to "Using Android Studio" Bug
16679117
smain@google.com [Tue, 9 Dec 2014 21:33:27 +0000 (21:33 +0000)]
am
8aebbf0d: am
0ecb5a68: add links to release notes
* commit '
8aebbf0dbaf37b558307a9d794dfbb041ce55614':
add links to release notes
David Friedman [Tue, 9 Dec 2014 21:33:17 +0000 (21:33 +0000)]
am
83e96ca8: am
1a0159f2: Merge "CSS change changing default from "Using Eclipse" to "Using Android Studio" Bug
16679117" into lmp-docs
* commit '
83e96ca8c24256a989881d59d24f66d439c2f5f4':
CSS change changing default from "Using Eclipse" to "Using Android Studio" Bug
16679117
Qiwen Zhao [Tue, 9 Dec 2014 16:06:10 +0000 (16:06 +0000)]
Merge "Merge commit '
aaf823d2' into lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp
Dan Albert [Tue, 9 Dec 2014 13:18:44 +0000 (13:18 +0000)]
am
e98755f9: Merge "Add a SANITIZE_HOST flag."
* commit '
e98755f9d6619ff141d099f9da655d141da72b8e':
Add a SANITIZE_HOST flag.
Dan Albert [Tue, 9 Dec 2014 13:18:43 +0000 (13:18 +0000)]
am
cd814343: Merge "Let clang decide ASan linker flags for the host."
* commit '
cd814343e897ae8b6d19874163eec8d89c6ae37f':
Let clang decide ASan linker flags for the host.
smain@google.com [Tue, 9 Dec 2014 03:04:58 +0000 (03:04 +0000)]
am
0ecb5a68: add links to release notes
* commit '
0ecb5a688e6a954e8296547e84e58959e30ccd4e':
add links to release notes
David Friedman [Tue, 9 Dec 2014 00:31:41 +0000 (00:31 +0000)]
am
1a0159f2: Merge "CSS change changing default from "Using Eclipse" to "Using Android Studio" Bug
16679117" into lmp-docs
* commit '
1a0159f216076579d128d17dc8292904606a3420':
CSS change changing default from "Using Eclipse" to "Using Android Studio" Bug
16679117
smain@google.com [Mon, 8 Dec 2014 20:39:52 +0000 (12:39 -0800)]
add links to release notes
Change-Id: I04be73254e6d9bd020e9dea5b7d46b92e17e8f31
David Friedman [Mon, 8 Dec 2014 19:55:47 +0000 (19:55 +0000)]
Merge "CSS change changing default from "Using Eclipse" to "Using Android Studio" Bug
16679117" into lmp-docs
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.
Dan Albert [Mon, 8 Dec 2014 19:07:33 +0000 (19:07 +0000)]
Merge "Add a SANITIZE_HOST flag."
Dan Albert [Mon, 8 Dec 2014 19:06:01 +0000 (19:06 +0000)]
Merge "Let clang decide ASan linker flags for the host."
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)
Dan Albert [Fri, 31 Oct 2014 23:23:08 +0000 (16:23 -0700)]
Add a SANITIZE_HOST flag.
We had discussed the idea of making all host tools default to using
ASAN. Even if we don't make it the default, this makes it easy for the
user to switch all host binaries over.
Change-Id: I64a5c741b1b4e9aefed3a6be8dcd4f386e06b29c
Qiwen Zhao [Sat, 6 Dec 2014 04:29:34 +0000 (20:29 -0800)]
Merge commit '
aaf823d2' into lmp-mr1-dev-plus-aosp
Dan Albert [Sat, 15 Nov 2014 01:15:00 +0000 (17:15 -0800)]
Let clang decide ASan linker flags for the host.
Pass -fsanitize=address instead of manually specifying asan libraries
and other linker flags.
Note that we enable LOCAL_ALLOW_UNDEFINED_SYMBOLS by default for host
builds because ASAN only links symbols in the final executable, so
there will _always_ be undefined symbols in intermediate libraries.
Bug:
18208352
Change-Id: Ief55ab296e94974560eeb10507ec8d90f0025d5c
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.
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
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
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:51:36 +0000 (19:51 +0000)]
am
ea4f39e8: Merge "Switch to Clang 3.6."
* commit '
ea4f39e86d315793390fb84b5b4d667aa4d3917b':
Switch to Clang 3.6.
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
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 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 [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
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: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."
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