OSDN Git Service
Scott Main [Sat, 10 Sep 2016 01:33:18 +0000 (01:33 +0000)]
Merge "add support for constraint layout's DATA list" into nyc-dev
am:
64bd41ff7d
Change-Id: Iece4de40cbd0854165e39767ef379a4b75fb66b5
smain@google.com [Sat, 10 Sep 2016 01:33:17 +0000 (01:33 +0000)]
add support for constraint layout's DATA list
am:
7055897faa
Change-Id: Ibce59cf7867e6a197a39873453dae8336419e233
Scott Main [Sat, 10 Sep 2016 01:28:08 +0000 (01:28 +0000)]
Merge "add support for constraint layout's DATA list" into nyc-dev
smain@google.com [Fri, 9 Sep 2016 22:37:47 +0000 (15:37 -0700)]
add support for constraint layout's DATA list
Change-Id: Ia301ad235dcfd5a5c2bb13bfa6daa753f9206800
Colin Cross [Fri, 9 Sep 2016 20:37:29 +0000 (20:37 +0000)]
Merge "Remove global linker search paths" am:
39c1c9ae12
am:
01d1c0b442
Change-Id: Ifd0478970be0ab37374f5445b5a9501a0c041123
Colin Cross [Fri, 9 Sep 2016 20:34:29 +0000 (20:34 +0000)]
Merge "Remove global linker search paths"
am:
39c1c9ae12
Change-Id: I3eddb29f5e0c0d4fe3d5bc012c27c11509e3de8d
Colin Cross [Fri, 9 Sep 2016 20:27:21 +0000 (20:27 +0000)]
Merge "Remove global linker search paths"
Colin Cross [Fri, 9 Sep 2016 17:09:47 +0000 (10:09 -0700)]
Remove global linker search paths
Remove the global linker search path, as it can cause spurious build
failures. If a library with the same name as a system library is in the
process of being written to the directory in the global search path, and
the linker may try to read the partially-written built one instead of the
system one. We already use full paths to libraries for target builds,
do the same for host builds. Also remove the normalize library
functions, they are no longer necessary.
Test: m -j checkbuild
Bug:
31393456
Change-Id: If9fc631e111f568c700fd73e103445c30d7e9d11
Dan Willemsen [Fri, 9 Sep 2016 01:38:22 +0000 (01:38 +0000)]
Merge "Prevent Kati from seeing MAKEFLAGS" am:
6b363e24bd
am:
01784e0aef
Change-Id: I751acea9a09e67cb65954502cc562408d948a133
Dan Willemsen [Fri, 9 Sep 2016 01:35:51 +0000 (01:35 +0000)]
Merge "Prevent Kati from seeing MAKEFLAGS"
am:
6b363e24bd
Change-Id: I8bc18aa66c7b621ed90d82412b6c29e72334f3f1
Treehugger Robot [Fri, 9 Sep 2016 01:25:21 +0000 (01:25 +0000)]
Merge "Prevent Kati from seeing MAKEFLAGS"
Dan Willemsen [Fri, 9 Sep 2016 00:08:31 +0000 (17:08 -0700)]
Prevent Kati from seeing MAKEFLAGS
We never want Kati to see MAKEFLAGS, as forcefully overriding variables
is terrible. The variables in MAKEFLAGS are still available in the
environment, so if part of the build wants input from the user, it
should be explicitly checking for an environment variable or using ?=
This commit shouldn't actually change any behavior -- the version of
Kati checked into our tree doesn't actually read MAKEFLAGS (the latest
version does, which is why this change is necessary). We're also already
clearing MAKEFLAGS during makeparallel, so the USE_GOMA case already
doesn't pass through MAKEFLAGS.
Test: Manual $(warnings $(origin MYTEST) $(MYTEST)) with old and new Kati
Change-Id: I5e4ffa66b3539a539cc7a26da24645b11445c469
Dan Willemsen [Thu, 8 Sep 2016 20:55:04 +0000 (20:55 +0000)]
Merge "Blacklist the GOMACC_PATH environment variable" am:
b2498a22c2
am:
4e3e6c76d0
Change-Id: Iec477fd5002a486d266b2926b21f901f5c8abf30
Dan Willemsen [Thu, 8 Sep 2016 20:52:34 +0000 (20:52 +0000)]
Merge "Blacklist the GOMACC_PATH environment variable"
am:
b2498a22c2
Change-Id: I987d05196b3b15f5019f7a9497867fa9c39cec12
Dan Willemsen [Thu, 8 Sep 2016 20:47:19 +0000 (20:47 +0000)]
Merge "Blacklist the GOMACC_PATH environment variable"
Chih-hung Hsieh [Thu, 8 Sep 2016 20:37:03 +0000 (20:37 +0000)]
Merge "Define DEFAULT_TIDY_HEADER_DIRS." am:
9d66e2c2ef
am:
84be3dc50a
Change-Id: I2d331c92195714935093171af16bfde0788cca43
Chih-hung Hsieh [Thu, 8 Sep 2016 20:34:34 +0000 (20:34 +0000)]
Merge "Define DEFAULT_TIDY_HEADER_DIRS."
am:
9d66e2c2ef
Change-Id: Ifbcded2a3d1f0852ba348fc7954e835c05760d5a
Chih-hung Hsieh [Thu, 8 Sep 2016 20:24:07 +0000 (20:24 +0000)]
Merge "Define DEFAULT_TIDY_HEADER_DIRS."
Dan Willemsen [Thu, 8 Sep 2016 19:45:15 +0000 (12:45 -0700)]
Blacklist the GOMACC_PATH environment variable
The clang compiler wrapper will be looking for this environment
variable, but it should only ever be set by the `gomacc` in CC_WRAPPER.
Make sure that it isn't otherwise set in the environment.
Change-Id: I4b26c7183bc47f71dffa7dfcc2e5b08e840a11b1
Alex Klyubin [Thu, 8 Sep 2016 17:20:36 +0000 (17:20 +0000)]
Merge ""SignApk" in Created-By header" am:
6e85eeaf53
am:
1989b26783
Change-Id: Ie6ba1f239e36ee671ae9b5973bef6f1b8f584b5a
Alex Klyubin [Thu, 8 Sep 2016 17:18:01 +0000 (17:18 +0000)]
Merge ""SignApk" in Created-By header"
am:
6e85eeaf53
Change-Id: I5b87f9655b88bdeed5ccfccbf5b76e94243592f6
Treehugger Robot [Thu, 8 Sep 2016 17:10:37 +0000 (17:10 +0000)]
Merge ""SignApk" in Created-By header"
Colin Cross [Wed, 7 Sep 2016 22:07:18 +0000 (22:07 +0000)]
Merge "Build symlinks for -host and -target phony modules" am:
d81559e6ac
am:
cf94d1dbdc
Change-Id: If14c8e7ca133f737638b48f70657903cca6d9a7e
Colin Cross [Wed, 7 Sep 2016 22:05:18 +0000 (22:05 +0000)]
Merge "Build symlinks for -host and -target phony modules"
am:
d81559e6ac
Change-Id: I133cae0be0a8328af1b9b186e7d47e4f46a11406
Treehugger Robot [Wed, 7 Sep 2016 22:00:24 +0000 (22:00 +0000)]
Merge "Build symlinks for -host and -target phony modules"
Colin Cross [Wed, 7 Sep 2016 19:48:30 +0000 (12:48 -0700)]
Build symlinks for -host and -target phony modules
Move extra module dependencies like symlinks from dependencies of
$(my_register_name) to $(my_all_targets), and make $(my_register_name)
and other convenience phony modules depend on $(my_all_targets). Move
$(LOCAL_MODULE)-host/-target to depend on $(my_all_targets) instead of
directly depending on the built and installed modules.
Change-Id: I3b093986db7a1bff118f1f2482275f0997a98fb6
Alex Klyubin [Wed, 7 Sep 2016 20:21:00 +0000 (13:21 -0700)]
"SignApk" in Created-By header
The switch to apksig changed the Created-By header value in .SF file
from "1.0 (Android SignApk)" to "1.0 (Android apksigner)". This commit
reverts the value back to "1.0 (Android SignApk)".
Change-Id: I2fc462cade40a5b31bb6191996fd6f18fabbf08f
Casey Dahlin [Wed, 7 Sep 2016 20:06:41 +0000 (20:06 +0000)]
Merge "Add tool to copy files in to fat16 images" am:
bfea84dabc
am:
f061b906e4
Change-Id: Ia3988e59b82245ffa41b92a5df057cada1ac6154
Casey Dahlin [Wed, 7 Sep 2016 20:04:13 +0000 (20:04 +0000)]
Merge "Add tool to copy files in to fat16 images"
am:
bfea84dabc
Change-Id: I9647fc5f7b96370a74e603cdd3fb29021e7905a6
Treehugger Robot [Wed, 7 Sep 2016 19:51:06 +0000 (19:51 +0000)]
Merge "Add tool to copy files in to fat16 images"
Chih-hung Hsieh [Wed, 7 Sep 2016 05:38:05 +0000 (05:38 +0000)]
Merge "Recognize new clang-tidy and Java warnings." am:
0c9a2ee864
am:
7df7722f2a
Change-Id: I6ee8322bea222340457ce1245844f5e2e6a426dc
Chih-hung Hsieh [Wed, 7 Sep 2016 05:35:35 +0000 (05:35 +0000)]
Merge "Recognize new clang-tidy and Java warnings."
am:
0c9a2ee864
Change-Id: I81f6d78600d0a168dec75171bee5de01c5a068b2
Chih-hung Hsieh [Wed, 7 Sep 2016 05:27:45 +0000 (05:27 +0000)]
Merge "Recognize new clang-tidy and Java warnings."
Chih-Hung Hsieh [Tue, 6 Sep 2016 23:26:46 +0000 (16:26 -0700)]
Recognize new clang-tidy and Java warnings.
Test: run warn.py with build.log
Change-Id: I11ff844bcfd7fb13aef8909307bc7eb1f5ee9b2a
Chih-Hung Hsieh [Wed, 7 Sep 2016 03:06:28 +0000 (20:06 -0700)]
Define DEFAULT_TIDY_HEADER_DIRS.
Let clang-tidy report warnings in header files in the
system and current directories but not the external
and vendor directories.
Test: build with WITH_TIDY=1
Change-Id: I1723b8eb95948961fb7164a19989e0a926e5bf8a
Duane Sand [Tue, 6 Sep 2016 22:54:01 +0000 (22:54 +0000)]
Merge changes I65c3fa9a,Id1ea5e8b am:
126ea5a55c
am:
7363b91cb1
Change-Id: I5496223f82953429717dfb185b8ee34074fa11c4
Duane Sand [Tue, 6 Sep 2016 22:51:03 +0000 (22:51 +0000)]
Merge changes I65c3fa9a,Id1ea5e8b
am:
126ea5a55c
Change-Id: If6d054b480245d50315938a65dd07aca32449c84
Treehugger Robot [Tue, 6 Sep 2016 22:38:39 +0000 (22:38 +0000)]
Merge changes I65c3fa9a,Id1ea5e8b
* changes:
Pair mips64r6 with mips32r2 on Aosp
Allowing pairing mips64r6 with mips32r1 and r2
Dan Willemsen [Tue, 6 Sep 2016 21:55:32 +0000 (21:55 +0000)]
Merge "Use full path in symbols zip file" am:
72dcbeb4bc
am:
afb93b7b2f
Change-Id: Ia5fed8a3b237ca5d9d494d5b3000687f92933e35
Dan Willemsen [Tue, 6 Sep 2016 21:52:06 +0000 (21:52 +0000)]
Merge "Use full path in symbols zip file"
am:
72dcbeb4bc
Change-Id: I6f5db95ec6f13d8562c14a484751c9d659eb226d
Treehugger Robot [Tue, 6 Sep 2016 21:40:19 +0000 (21:40 +0000)]
Merge "Use full path in symbols zip file"
Dan Willemsen [Tue, 6 Sep 2016 20:47:05 +0000 (13:47 -0700)]
Use full path in symbols zip file
This was accidentally changed when moving to soong_zip.
Change-Id: I5f889c3c83b6f888e765d4c35486576fa11f6945
smain@google.com [Tue, 6 Sep 2016 18:04:32 +0000 (18:04 +0000)]
delete 'templates-sdk-dev', all these files were merged back into 'templates-sdk' with this CL: https://googleplex-android-review.git.corp.google.com/#/c/
1394582/ and this depends on the following CL to update all the doc build targets: https://googleplex-android-review.git.corp.google.com/#/c/
1406302/
am:
6c8efecbda
Change-Id: Id24a404a3944049979397d08c58ccbaeb7772e9a
Colin Cross [Sat, 3 Sep 2016 00:35:54 +0000 (00:35 +0000)]
Merge "Remove HOST_PREFER_32_BIT" am:
182ff5e2e7
am:
a128976547
Change-Id: I752f079e3a3b68a28ed49bb577b233dd11c26d77
Colin Cross [Sat, 3 Sep 2016 00:33:26 +0000 (00:33 +0000)]
Merge "Remove HOST_PREFER_32_BIT"
am:
182ff5e2e7
Change-Id: I1fdb2a963d2e2dded21ee91998388a68b9ea03a4
Colin Cross [Sat, 3 Sep 2016 00:29:41 +0000 (00:29 +0000)]
Merge "Remove HOST_PREFER_32_BIT"
Vishwath Mohan [Fri, 2 Sep 2016 21:43:40 +0000 (21:43 +0000)]
Merge "Create sub-directory for fuzzers under nativetest." am:
0464662888
am:
fc7f43954b
Change-Id: I3e9b1ebeb66c8e2d7ab7cb6ef8d5fa281ca474cd
Vishwath Mohan [Fri, 2 Sep 2016 21:38:41 +0000 (21:38 +0000)]
Merge "Create sub-directory for fuzzers under nativetest."
am:
0464662888
Change-Id: I16b6652473326811c0ceac3cb9997ff82c6ada73
Vishwath Mohan [Fri, 2 Sep 2016 21:27:41 +0000 (21:27 +0000)]
Merge "Create sub-directory for fuzzers under nativetest."
Casey Dahlin [Fri, 2 Sep 2016 01:07:15 +0000 (18:07 -0700)]
Add tool to copy files in to fat16 images
fat16copy.py can be used to copy files or directories in to the root of
a fat16 image.
Usage: fat16copy <image> <file> [<file> ...]
Test: Used to compose a Raspberry Pi 3 boot image
Bug:
28912590
Change-Id: I29c9eec3786e2c5cc94f9a160360bac850809a93
Vishwath Mohan [Fri, 2 Sep 2016 20:25:59 +0000 (13:25 -0700)]
Create sub-directory for fuzzers under nativetest.
This CL changes BUILD_FUZZ_TEST to generate binaries in a
sub-directory called fuzzers/ under the nativetest directory. This
allows fuzzers to be distinguished from the other native tests and
makes it easier to perform automated fuzz-testing.
Bug:
25714111
Change-Id: I452e43f15728ec9168dd44776b6ffcea6037fa7f
Colin Cross [Fri, 2 Sep 2016 20:20:52 +0000 (13:20 -0700)]
Remove HOST_PREFER_32_BIT
HOST_PREFER_32_BIT was used during the switch to 64-bit host tools to
keep the SDK building as 32-bit, but is never set any more.
Change-Id: I874f89c7d1e9cd8c9d4c879048d81a4362ce4dce
Sami Tolvanen [Fri, 2 Sep 2016 18:21:42 +0000 (18:21 +0000)]
Merge "build_image: add padding to match partition size" am:
ef5751c1ec
am:
5875285ecf
Change-Id: I6b5e882c7a980d43aad310ed925061da6d3a4c4a
Sami Tolvanen [Fri, 2 Sep 2016 18:18:32 +0000 (18:18 +0000)]
Merge "build_image: add padding to match partition size"
am:
ef5751c1ec
Change-Id: Ia06afb7351d15b6726bd92cdbe92fca8b5116da3
Treehugger Robot [Fri, 2 Sep 2016 18:13:32 +0000 (18:13 +0000)]
Merge "build_image: add padding to match partition size"
smain@google.com [Fri, 2 Sep 2016 18:02:41 +0000 (11:02 -0700)]
delete 'templates-sdk-dev', all these files were merged
back into 'templates-sdk' with this CL:
https://googleplex-android-review.git.corp.google.com/#/c/
1394582/
and this depends on the following CL to update all the doc build targets:
https://googleplex-android-review.git.corp.google.com/#/c/
1406302/
Change-Id: Id38134e1d35c5235bb66241c50945b55ac9de1dd
Sami Tolvanen [Thu, 1 Sep 2016 22:58:35 +0000 (15:58 -0700)]
build_image: add padding to match partition size
For some partition sizes, we currently build an image that's 1-2
blocks smaller than the actual partition, which causes fs_mgr to
not find metadata. This change adds padding to FEC metadata that
correctly positions the metadata header at the end.
Bug:
28865197
Change-Id: Ie0e044715a9c5ae8ba395e7d2ff9fbd7cffc0b4c
Colin Cross [Thu, 1 Sep 2016 23:45:32 +0000 (23:45 +0000)]
Merge "Walk up tree to find makefiles in mma" am:
5ccafd0f29
am:
8ff4ea8ada
Change-Id: Ic6b1fbdc277ea4776e75d2de83152c57161278bb
Colin Cross [Thu, 1 Sep 2016 23:42:34 +0000 (23:42 +0000)]
Merge "Walk up tree to find makefiles in mma"
am:
5ccafd0f29
Change-Id: Ia43e06a1f7169f9ed709fbbb3ef7763b9155daf2
Treehugger Robot [Thu, 1 Sep 2016 23:34:52 +0000 (23:34 +0000)]
Merge "Walk up tree to find makefiles in mma"
Colin Cross [Thu, 1 Sep 2016 22:30:18 +0000 (15:30 -0700)]
Walk up tree to find makefiles in mma
Call findmakefile in mma to walk up the tree to find the nearest
makefile. Fixes mma in subdirectories of directories that have
Android.mk or Android.bp files.
Change-Id: I6fa509171699071fc34a2a75dd7e191d4ddca31a
Colin Cross [Thu, 1 Sep 2016 17:19:07 +0000 (17:19 +0000)]
Merge "Canonicalize mmm path" am:
a5b02ff1ef
am:
619e1dbb66
Change-Id: I2906fb3ee2a459a0e648bbc77d944e621feb88fc
Colin Cross [Thu, 1 Sep 2016 17:15:40 +0000 (17:15 +0000)]
Merge "Canonicalize mmm path"
am:
a5b02ff1ef
Change-Id: Ib9d8de38a7b5d63a2be023b538797df17c5451d5
Treehugger Robot [Thu, 1 Sep 2016 17:04:49 +0000 (17:04 +0000)]
Merge "Canonicalize mmm path"
Colin Cross [Thu, 1 Sep 2016 16:12:25 +0000 (16:12 +0000)]
Merge "Don't double-wrap with gomacc" am:
b7a12806b1
am:
70683c3ccf
Change-Id: I041bdcc7d533109749df3b2c07597c098ecd8821
Colin Cross [Thu, 1 Sep 2016 16:09:29 +0000 (16:09 +0000)]
Merge "Don't double-wrap with gomacc"
am:
b7a12806b1
Change-Id: If5e9b3a9dabfd3db9b16fe37e5ed0ffad956cfbb
Colin Cross [Thu, 1 Sep 2016 15:59:38 +0000 (15:59 +0000)]
Merge "Don't double-wrap with gomacc"
Colin Cross [Thu, 1 Sep 2016 00:22:36 +0000 (17:22 -0700)]
Canonicalize mmm path
Canonicalize the mmm path relative to the top level before creating the
MODULES-IN-dir target. Fixes cd frameworks/base; mmm -j .
Test: cd frameworks/base; mmm -j
Change-Id: If7bc321e8a87b76121f876bf4bc296b0f9b80578
smain@google.com [Wed, 31 Aug 2016 22:17:16 +0000 (22:17 +0000)]
Merge all of templates-sdk-dev into templates-sdk. I actually just deleted templates-sdk/ then made a copy of templates-sdk-dev/ and then renamed it to templates-sdk/. So this is a clean copy. Once this goes through cleanly, I'll delete templates-sdk-dev/ and update all doc targets to use templates-sdk/.
am:
4f3a05a2c6
Change-Id: Icd5ae3ecdeb840c347c6bedcfc802fe2e6c4a76f
Colin Cross [Wed, 31 Aug 2016 21:23:28 +0000 (21:23 +0000)]
Merge "Create more shortcut phony targets" am:
44303e9f26
am:
dc56268641
Change-Id: Ic33ee46b73f6f56646ad8a6b69fef023e510cad0
Colin Cross [Wed, 31 Aug 2016 21:20:33 +0000 (21:20 +0000)]
Merge "Create more shortcut phony targets"
am:
44303e9f26
Change-Id: I0b42e1f01e7a0eb1b731459c581155b952e67a19
Colin Cross [Wed, 31 Aug 2016 21:16:22 +0000 (21:16 +0000)]
Merge "Create more shortcut phony targets"
Colin Cross [Wed, 31 Aug 2016 20:32:39 +0000 (13:32 -0700)]
Don't double-wrap with gomacc
config.mk is parsed by make and then kati, and goma.mk appends to
CC_WRAPPER. Only export it from make so gomacc doesn't appear twice on
the command line.
Bug:
31142427
Change-Id: I5ad97ee3a00b013faa620215c839499b48528e00
Colin Cross [Wed, 31 Aug 2016 20:21:18 +0000 (20:21 +0000)]
Merge "Enable goma in soong" am:
753ed863c5
am:
cc7f1318e9
Change-Id: I329831ecf9e4b38dbf8d7fdb76a9bba3288f5b70
Colin Cross [Wed, 31 Aug 2016 20:18:49 +0000 (20:18 +0000)]
Merge "Enable goma in soong"
am:
753ed863c5
Change-Id: I10cd9f5f447124b0aff58b8aaf7a0fadafe3ac59
Colin Cross [Wed, 31 Aug 2016 20:08:57 +0000 (20:08 +0000)]
Merge "Enable goma in soong"
smain@google.com [Wed, 31 Aug 2016 18:30:02 +0000 (11:30 -0700)]
Merge all of templates-sdk-dev into templates-sdk.
I actually just deleted templates-sdk/ then made a copy of templates-sdk-dev/
and then renamed it to templates-sdk/. So this is a clean copy.
Once this goes through cleanly, I'll delete templates-sdk-dev/ and update
all doc targets to use templates-sdk/.
Change-Id: I276695969e02fcf718370564e84b077a9d43725e
Colin Cross [Wed, 31 Aug 2016 16:35:32 +0000 (09:35 -0700)]
Enable goma in soong
Pass the USE_GOMA flag to soong, and export the CC_WRAPPER environment
variable after adding gomacc to it.
Bug:
31142427
Change-Id: I6de698a40817c0615b03fa17bd27075465d79ffd
Dan Willemsen [Wed, 31 Aug 2016 16:14:28 +0000 (16:14 +0000)]
Merge "Simplify Soong bootstrapping" am:
2e5dc07c1f
am:
67dc1c2e4c
Change-Id: I9ba778c1d632e7659cf2343078bb6778a31ad13f
Dan Willemsen [Wed, 31 Aug 2016 16:11:46 +0000 (16:11 +0000)]
Merge "Simplify Soong bootstrapping"
am:
2e5dc07c1f
Change-Id: I90835790fe8a2b6d526a8c345638c8380972beaa
Dan Willemsen [Wed, 31 Aug 2016 16:06:35 +0000 (16:06 +0000)]
Merge "Simplify Soong bootstrapping"
smain@google.com [Wed, 31 Aug 2016 15:09:46 +0000 (15:09 +0000)]
delete templates-ds (the original attempt to template docs for devsite) delete templates-sdk-refonly (the "dev branch" for the reference only flag)
am:
6d00e69c3f
Change-Id: I5489a9a32196c21f98bbd4e3e98bc484fe5710e1
Dan Willemsen [Mon, 15 Aug 2016 20:38:21 +0000 (13:38 -0700)]
Simplify Soong bootstrapping
Now we only run the "main" stage from Soong once, and only when combined
with the Kati ninja file. So we can now depend on pools or rules defined
by Kati in Soong.
Change-Id: I7a8fd699ddc0d41bbcbbf3c6f2edb9e26ccfc4c9
Colin Cross [Tue, 30 Aug 2016 23:16:32 +0000 (16:16 -0700)]
Create more shortcut phony targets
Create shortcut phony targets for the host and device halves of
modules.
Change-Id: I1cf3a49118db830d78a1b83b2177715175949871
smain@google.com [Mon, 29 Aug 2016 21:49:18 +0000 (14:49 -0700)]
delete templates-ds (the original attempt to template docs for devsite)
delete templates-sdk-refonly (the "dev branch" for the reference only flag)
Change-Id: I73e2760fcca76b7242be9aefa92006df3a555a03
Scott Main [Tue, 30 Aug 2016 20:47:15 +0000 (20:47 +0000)]
Merge "delete no-longer-used custom sdkpage template. depends on https://googleplex-android-review.git.corp.google.com/#/c/
1389393/" into nyc-dev
am:
1b1c5c5ebc
Change-Id: I8e07e889675aece9bb7e1a9d823fabf6a563b01c
smain@google.com [Tue, 30 Aug 2016 20:47:13 +0000 (20:47 +0000)]
delete no-longer-used custom sdkpage template. depends on https://googleplex-android-review.git.corp.google.com/#/c/
1389393/
am:
42859fae46
Change-Id: I5e72be2acf921383733eeb09137be72786520325
Scott Main [Tue, 30 Aug 2016 20:47:11 +0000 (20:47 +0000)]
Merge "update templates-sdk-dev to support the referenceonly build. includes an updated snapshot of the css and js files from devsite" into nyc-dev
am:
a7e978b6b6
Change-Id: I7599764da0bc94f04190eed46b776f9023333ae4
smain@google.com [Tue, 30 Aug 2016 20:47:11 +0000 (20:47 +0000)]
update templates-sdk-dev to support the referenceonly build. includes an updated snapshot of the css and js files from devsite
am:
eeeb9b832a
Change-Id: I69c2bd63fdf1b894707ec911a65144ec38a2f07c
Scott Main [Tue, 30 Aug 2016 20:39:43 +0000 (20:39 +0000)]
Merge "delete no-longer-used custom sdkpage template. depends on https://googleplex-android-review.git.corp.google.com/#/c/
1389393/" into nyc-dev
Scott Main [Tue, 30 Aug 2016 20:39:20 +0000 (20:39 +0000)]
Merge "update templates-sdk-dev to support the referenceonly build. includes an updated snapshot of the css and js files from devsite" into nyc-dev
smain@google.com [Tue, 30 Aug 2016 17:52:40 +0000 (10:52 -0700)]
delete no-longer-used custom sdkpage template.
depends on https://googleplex-android-review.git.corp.google.com/#/c/
1389393/
Change-Id: Idd8f039294fe8c2c6dddf6d8a00a196222154d58
smain@google.com [Tue, 30 Aug 2016 01:12:27 +0000 (18:12 -0700)]
update templates-sdk-dev to support the referenceonly build.
includes an updated snapshot of the css and js files from devsite
Change-Id: Ib597c1dd488347795e02e1d09880559ead1d54e0
Amanda Kassay [Tue, 30 Aug 2016 16:49:54 +0000 (16:49 +0000)]
Remove hard coded leading slash in head_tag.cs for DevSite image_path meta tag.
am:
c9ef9fea7f
Change-Id: I05f1fe5a3e3bdfd197fbaf84de9dff3567a0279b
Dan Willemsen [Tue, 30 Aug 2016 01:19:21 +0000 (01:19 +0000)]
Merge "Check USE_GOMA consistently" am:
049dd57872
am:
60204ae5ba
Change-Id: I4bb034cecfab78d3a4b5683cd356c6230a04cc7a
Amanda Kassay [Mon, 29 Aug 2016 21:13:49 +0000 (17:13 -0400)]
Remove hard coded leading slash in head_tag.cs for DevSite image_path meta tag.
Change-Id: I994148882b2f4fbe233f02eb8e35c335af0c32f8
Dan Willemsen [Mon, 29 Aug 2016 20:44:16 +0000 (20:44 +0000)]
Merge "Check USE_GOMA consistently"
am:
049dd57872
Change-Id: Ia838646334435a7bdbd862db2c7b2a697c791265
Treehugger Robot [Mon, 29 Aug 2016 20:36:00 +0000 (20:36 +0000)]
Merge "Check USE_GOMA consistently"
Pirama Arumuga Nainar [Mon, 29 Aug 2016 19:58:36 +0000 (19:58 +0000)]
Merge "Switch to prebuilt clang-
3217047" am:
3500ddfe1b
am:
c3c8abdf2a
Change-Id: I6cba69a16581e322342a577c05b1fff051db53ab
Pirama Arumuga Nainar [Mon, 29 Aug 2016 19:55:38 +0000 (19:55 +0000)]
Merge "Switch to prebuilt clang-
3217047"
am:
3500ddfe1b
Change-Id: I9d9e8ef2be4158afa814279b073a1109a12f1970
OSDN Git Service
