Elliott Hughes
695a080462
am 55e21af2: Merge "Remove unused OS_SHARED_LIB_FORMAT_STR."
...
* commit '55e21af2079b7f44b7aa70d8ba08075e8a79ff38':
Remove unused OS_SHARED_LIB_FORMAT_STR.
2014-12-13 18:59:39 +00:00
Elliott Hughes
55e21af207
Merge "Remove unused OS_SHARED_LIB_FORMAT_STR."
2014-12-13 18:51:23 +00:00
Elliott Hughes
da225948e6
Remove unused OS_SHARED_LIB_FORMAT_STR.
...
Change-Id: Ibaaf112c5a6bfe2084fe34e32e31bcd755e718a8
2014-12-12 15:54:56 -08:00
Dianne Hackborn
9f6353e014
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.
2014-12-12 14:42:11 +00:00
Dianne Hackborn
c5fd92a3ea
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.
2014-12-12 00:26:01 +00:00
Dianne Hackborn
423854bfb9
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.
2014-12-12 00:19:51 +00:00
Dianne Hackborn
934b04d376
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.
2014-12-11 22:29:46 +00:00
Dianne Hackborn
27fad66a8c
Merge "DO NOT MERGE. Bump version to 5.0.2." into lmp-dev
2014-12-11 22:25:32 +00:00
Dianne Hackborn
592c24d865
DO NOT MERGE. Bump version to 5.0.2.
...
Change-Id: Ia6426dd03ac3b51061429b7da36e317bd3503775
2014-12-11 14:21:48 -08:00
Ying Wang
b283ef2c3b
am 18eee18e: am 60686586: Add product variable PRODUCT_AAPT_PREBUILT_DPI
...
* commit '18eee18e6e51da4857054376ad96add16c0c0b92':
Add product variable PRODUCT_AAPT_PREBUILT_DPI
2014-12-11 00:07:38 +00:00
Ying Wang
904e88b5be
am 8750cfc5: am 111ba923: Bump generic_arm64 system partition size to 900M.
...
* commit '8750cfc5b5af821c90b224e727729e721c981e78':
Bump generic_arm64 system partition size to 900M.
2014-12-10 22:36:49 +00:00
Ying Wang
18eee18e6e
am 60686586: Add product variable PRODUCT_AAPT_PREBUILT_DPI
...
* commit '60686586a5f9c8f78b9ad16e19782da85e89a760':
Add product variable PRODUCT_AAPT_PREBUILT_DPI
2014-12-10 22:19:49 +00:00
Ying Wang
60686586a5
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
2014-12-10 12:40:09 -08:00
Ying Wang
8750cfc5b5
am 111ba923: Bump generic_arm64 system partition size to 900M.
...
* commit '111ba923bec7e99d3ee49688f7ad426b760f8b36':
Bump generic_arm64 system partition size to 900M.
2014-12-10 18:52:51 +00:00
Ying Wang
111ba923be
Bump generic_arm64 system partition size to 900M.
...
This fixes the arm64 sdk build.
Change-Id: Ic7b7ada79027845974cbcfc68941cfc87ed050fd
2014-12-10 09:56:06 -08:00
smain@google.com
18b3eb1de5
am 425aa9f9: am 79ad9c78: am 8aebbf0d: am 0ecb5a68: add links to release notes
...
* commit '425aa9f99ba73cea3d469727d5eb446eeb43d0c9':
add links to release notes
2014-12-09 23:15:06 +00:00
David Friedman
46c4bcdcb8
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
2014-12-09 23:15:05 +00:00
smain@google.com
425aa9f99b
am 79ad9c78: am 8aebbf0d: am 0ecb5a68: add links to release notes
...
* commit '79ad9c786a33f9f433fd943f87a2c8b1975e89a5':
add links to release notes
2014-12-09 22:20:22 +00:00
David Friedman
13c3e7eb90
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
2014-12-09 22:20:21 +00:00
smain@google.com
79ad9c786a
am 8aebbf0d: am 0ecb5a68: add links to release notes
...
* commit '8aebbf0dbaf37b558307a9d794dfbb041ce55614':
add links to release notes
2014-12-09 21:33:27 +00:00
David Friedman
03e066b759
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
2014-12-09 21:33:17 +00:00
Qiwen Zhao
c3851b18bb
Merge "Merge commit 'aaf823d2' into lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp
2014-12-09 16:06:11 +00:00
Dan Albert
023fd1fca8
am e98755f9: Merge "Add a SANITIZE_HOST flag."
...
* commit 'e98755f9d6619ff141d099f9da655d141da72b8e':
Add a SANITIZE_HOST flag.
2014-12-09 13:18:44 +00:00
Dan Albert
ee582aac41
am cd814343: Merge "Let clang decide ASan linker flags for the host."
...
* commit 'cd814343e897ae8b6d19874163eec8d89c6ae37f':
Let clang decide ASan linker flags for the host.
2014-12-09 13:18:43 +00:00
smain@google.com
8aebbf0dba
am 0ecb5a68: add links to release notes
...
* commit '0ecb5a688e6a954e8296547e84e58959e30ccd4e':
add links to release notes
2014-12-09 03:04:58 +00:00
David Friedman
83e96ca8c2
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
2014-12-09 00:31:41 +00:00
smain@google.com
0ecb5a688e
add links to release notes
...
Change-Id: I04be73254e6d9bd020e9dea5b7d46b92e17e8f31
2014-12-08 13:58:54 -08:00
David Friedman
1a0159f216
Merge "CSS change changing default from "Using Eclipse" to "Using Android Studio" Bug 16679117" into lmp-docs
2014-12-08 19:55:47 +00:00
smain@google.com
5d48286c01
am 30aea34e: am 07c19f68: am 87b1b5ed: am 102db8b5: update sdk template with new studio downloads
...
* commit '30aea34eaed65032675c448be3534a070e1910b6':
update sdk template with new studio downloads
2014-12-08 19:41:31 +00:00
smain@google.com
f0a2e5eb86
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
2014-12-08 19:39:57 +00:00
Rich Slogar
0e41ac7803
am 2305c8d9: am 8242ce83: am db8d79a9: am fe4dd526: docs: sdkpage update [CP]
...
* commit '2305c8d90c0fe0e57e4d0332749366ba5acde1a0':
docs: sdkpage update [CP]
2014-12-08 19:39:49 +00:00
Ying Wang
c6f3273db3
am be66d9f0: am 27eba54b: Add system propery ro.build.flavor.
...
* commit 'be66d9f09ada756a95a9efd3b67040a81b3322d1':
Add system propery ro.build.flavor.
2014-12-08 19:12:15 +00:00
Dan Albert
e98755f9d6
Merge "Add a SANITIZE_HOST flag."
2014-12-08 19:07:33 +00:00
Dan Albert
cd814343e8
Merge "Let clang decide ASan linker flags for the host."
2014-12-08 19:06:01 +00:00
Ed Heyl
898b9e43cf
resolve conflicts w/aaf823d2
...
Change-Id: I7c5cf1d1e074a67bdd19a7cf51f45e5f3e026c84
2014-12-08 10:53:50 -08:00
smain@google.com
30aea34eae
am 07c19f68: am 87b1b5ed: am 102db8b5: update sdk template with new studio downloads
...
* commit '07c19f688866715c6c30d8d8d58a7a9fa9a47d00':
update sdk template with new studio downloads
2014-12-08 07:24:39 +00:00
smain@google.com
07c19f6888
am 87b1b5ed: am 102db8b5: update sdk template with new studio downloads
...
* commit '87b1b5edb11644ac656a1d8df37201460289de94':
update sdk template with new studio downloads
2014-12-08 07:17:54 +00:00
smain@google.com
87b1b5edb1
am 102db8b5: update sdk template with new studio downloads
...
* commit '102db8b58bd51aeaa7409924d5dc341f2f72b892':
update sdk template with new studio downloads
2014-12-08 07:10:39 +00:00
smain@google.com
102db8b58b
update sdk template with new studio downloads
...
Change-Id: Iee43f4f4eb5c63d94884a463a73fc016b5a05c4e
2014-12-07 22:39:24 -08:00
smain@google.com
a324f898cc
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
2014-12-08 03:59:56 +00:00
smain@google.com
3984cca2a6
am 79ac4384: am d53f0660: update to sdk page template for Android Studio downloads
...
* commit '79ac4384637c77076f93307e61c8e2612df4a8cc':
update to sdk page template for Android Studio downloads
2014-12-08 03:53:00 +00:00
smain@google.com
79ac438463
am d53f0660: update to sdk page template for Android Studio downloads
...
* commit 'd53f0660f1fe40921d72b75abb9bfeee534b6b8c':
update to sdk page template for Android Studio downloads
2014-12-08 03:46:13 +00:00
smain@google.com
d53f0660f1
update to sdk page template for Android Studio downloads
...
Change-Id: I729a1238a97909d4087f7396cc478a5aea0c43cd
(cherry picked from commit 85fd6240cf
)
2014-12-08 03:30:05 +00:00
Rich Slogar
2305c8d90c
am 8242ce83: am db8d79a9: am fe4dd526: docs: sdkpage update [CP]
...
* commit '8242ce83d1181e71eb6b417cc58d5bcdc181c927':
docs: sdkpage update [CP]
2014-12-08 03:10:15 +00:00
Rich Slogar
8242ce83d1
am db8d79a9: am fe4dd526: docs: sdkpage update [CP]
...
* commit 'db8d79a9efefa4ba03a311904c4bf3b850f4f52b':
docs: sdkpage update [CP]
2014-12-08 03:03:49 +00:00
Rich Slogar
db8d79a9ef
am fe4dd526: docs: sdkpage update [CP]
...
* commit 'fe4dd5263f344c5420780626410b84d7383e801d':
docs: sdkpage update [CP]
2014-12-08 02:59:48 +00:00
Rich Slogar
fe4dd5263f
docs: sdkpage update [CP]
...
Change-Id: I06c8878c4b449a472a71f224a17bf9fef794de20
(cherry picked from commit 627f711a5d
)
2014-12-06 09:11:32 +00:00
Dan Albert
4ae5d4b331
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
2014-12-05 22:20:37 -08:00
Qiwen Zhao
3395c88f44
Merge commit 'aaf823d2' into lmp-mr1-dev-plus-aosp
2014-12-05 20:29:34 -08:00
Dan Albert
b58fb4aac6
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
2014-12-05 14:52:56 -08:00