OSDN Git Service
Ben Cheng [Mon, 28 Oct 2013 17:44:38 +0000 (17:44 +0000)]
Merge "Add the search path for libgcc.a and crt*.o."
Ben Cheng [Mon, 28 Oct 2013 17:27:58 +0000 (10:27 -0700)]
Add the search path for libgcc.a and crt*.o.
Change-Id: I727f5630f7667b98770d779d43be6a7901471c55
Ben Cheng [Fri, 25 Oct 2013 16:36:39 +0000 (16:36 +0000)]
Merge "Two quick fixes: fix kernel header location and nostdlib."
Ben Cheng [Fri, 25 Oct 2013 16:33:22 +0000 (09:33 -0700)]
Two quick fixes: fix kernel header location and nostdlib.
Change-Id: Idf2d101e16e895ca75a74a095091e3543b2b482b
Nick Kralevich [Thu, 24 Oct 2013 21:34:27 +0000 (21:34 +0000)]
Merge "x86: turn on -Wl,--fatal-warnings"
Nick Kralevich [Thu, 24 Oct 2013 20:32:05 +0000 (13:32 -0700)]
x86: turn on -Wl,--fatal-warnings
In
4f2f16da143fede94a1124ee79efccee78442b90, we added
-Wl,--warn-shared-textrel to TARGET_GLOBAL_LDFLAGS. This generated
a warning whenever we created a shared library with a text
relocation. At the time, we wrote:
=====
Emit a warning when the static linker detects a shared library
has text relocations. Text relocations make it harder to
share pages across processes, and make it harder to use
certain memory protection features in, for example, SELinux.
This warning will turn into an error in a future change
(via --fatal-warnings)
=====
All code which uses text relocations has either been fixed, or
we've temporarily worked around the issue so the code can still
compile.
Enable --fatal-warnings.
Bug:
11353056
Change-Id: I2f2c65352166ef0a96f54858de1556f0290fe306
Ben Cheng [Fri, 18 Oct 2013 16:45:12 +0000 (16:45 +0000)]
Merge "Point to the uapi header location for aarch64."
Ben Cheng [Wed, 16 Oct 2013 19:28:38 +0000 (12:28 -0700)]
Point to the uapi header location for aarch64.
Change-Id: Ic42f5520eb0711c35aaf7106939ef83e449bda74
Kenny Root [Mon, 14 Oct 2013 21:05:07 +0000 (21:05 +0000)]
Merge "Allow ECDSA signing OTA files"
Ian Rogers [Sat, 12 Oct 2013 00:30:31 +0000 (00:30 +0000)]
Merge "Specify -mcpu=cortex-a15 for krait CPU variants."
Ian Rogers [Fri, 11 Oct 2013 22:52:53 +0000 (15:52 -0700)]
Specify -mcpu=cortex-a15 for krait CPU variants.
Bug:
11178216
Change-Id: I9922e4cd5ba27e3857798aae5c84299e26e054ea
Kenny Root [Wed, 9 Oct 2013 22:00:14 +0000 (15:00 -0700)]
Allow ECDSA signing OTA files
ECDSA works in the recovery verifier, so we can allow OTA updates to be
signed with EC keys.
Change-Id: If8f2be028843fbfd6c8c9c41b492605d9b5cbeb0
Ben Cheng [Tue, 8 Oct 2013 21:42:32 +0000 (21:42 +0000)]
Merge "Explictily specify the dynamic linker name."
Ben Cheng [Tue, 8 Oct 2013 21:19:50 +0000 (14:19 -0700)]
Explictily specify the dynamic linker name.
Change-Id: Ie456f19cbe3dc8e3a9677638cc705b6eaf77c2b4
Elliott Hughes [Tue, 8 Oct 2013 17:09:03 +0000 (17:09 +0000)]
Merge "Remove explicit passing of dynamic loader name"
Pavel Chupin [Tue, 8 Oct 2013 07:35:39 +0000 (11:35 +0400)]
Remove explicit passing of dynamic loader name
We should trust toolchain on that.
Change-Id: I20dd882d167cc84c262aef245ea2d86c17bc1785
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
Ben Cheng [Mon, 7 Oct 2013 21:38:01 +0000 (21:38 +0000)]
Merge "Add generic aarch64 board config and build rules."
Ben Cheng [Fri, 4 Oct 2013 23:02:59 +0000 (16:02 -0700)]
Add generic aarch64 board config and build rules.
Change-Id: I8b4a377596705dfa0a3bd234162d183ec2ae9530
Elliott Hughes [Fri, 4 Oct 2013 21:37:46 +0000 (21:37 +0000)]
Merge "Remove useless x86 options that were always hardcoded on."
Elliott Hughes [Fri, 4 Oct 2013 07:00:52 +0000 (00:00 -0700)]
Remove useless x86 options that were always hardcoded on.
ARCH_X86_HAVE_MMX, ARCH_X86_HAVE_SSE, ARCH_X86_HAVE_SSE2,
and ARCH_X86_HAVE_SSE3 were all always on. There are no longer any makefiles
or code that are conditional on any of these, so let's just remove them
rather than encourage anyone to mess with knobs that don't work.
Change-Id: I5ee095e8041eecff4554ad4801894fbfca69093f
Ying Wang [Wed, 2 Oct 2013 22:00:26 +0000 (22:00 +0000)]
Merge "Duplicate i686 target arch options for x86_64."
Ying Wang [Wed, 2 Oct 2013 21:59:58 +0000 (21:59 +0000)]
Merge "x86_64: Adding new target"
Stephen Hines [Wed, 2 Oct 2013 18:35:29 +0000 (11:35 -0700)]
Duplicate i686 target arch options for x86_64.
Change-Id: I94a18562c38a20bac526b348eb98c2aba67a431f
Pavel Chupin [Mon, 26 Nov 2012 05:50:07 +0000 (09:50 +0400)]
x86_64: Adding new target
Add x86_64 Android builds. Compiler is expected to be able to understand
-m64 code generation option.
Change-Id: I99e7337c5a5766afc5e528a481bd21631ff44dd5
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
Kenny Root [Wed, 25 Sep 2013 21:37:17 +0000 (21:37 +0000)]
Merge "SignApk: add argument for loading a Provider"
Kenny Root [Wed, 25 Sep 2013 18:41:00 +0000 (18:41 +0000)]
Merge "Read algorithm OID directly from PKCS#8 container"
Kenny Root [Wed, 25 Sep 2013 18:14:33 +0000 (11:14 -0700)]
SignApk: add argument for loading a Provider
For supporting loading a custom key type provider, add a -providerClass
argument that loads the selected JCE at the front of the provider list.
Change-Id: I3df16f7c570d36e08806b614d6f30c41cb117565
Kenny Root [Wed, 25 Sep 2013 16:59:10 +0000 (09:59 -0700)]
Read algorithm OID directly from PKCS#8 container
The PKCS#8 PrivateKeyInfo structure has the algorithm OID encoded right
before the actual key octet stream is encoded. Use Bouncycastle to read
the OID for creation with the key factory.
This aids in the creation of custom key types that are backed by
hardware devices (e.g., HSMs) and have their own assigned OIDs.
Change-Id: If5d8fe07bc157e9bb5a3fb5f99091e924143105f
Kenny Root [Tue, 24 Sep 2013 18:04:57 +0000 (18:04 +0000)]
Merge "SignApk: add support for EC keys"
Kenny Root [Thu, 19 Sep 2013 19:49:36 +0000 (12:49 -0700)]
SignApk: add support for EC keys
Change-Id: I09bc0e52fc84ec321b997016a8f97de1bfd2770d
Kenny Root [Fri, 20 Sep 2013 21:18:44 +0000 (21:18 +0000)]
Merge "SignApk: update SignApk to support SHA256withRSA signing"
Doug Zongker [Wed, 10 Apr 2013 16:19:32 +0000 (09:19 -0700)]
SignApk: update SignApk to support SHA256withRSA signing
(cherry picked from commit
c0581a02ede48007623030c4ce13174ee972cc42)
Change-Id: I6212e0f3a6aa3265b111f0f7348b667af4a668b0
Ying Wang [Thu, 19 Sep 2013 16:45:15 +0000 (16:45 +0000)]
Merge "Extend x86 to have different arch variants"
Negreanu Marius Adrian [Wed, 28 Sep 2011 14:47:50 +0000 (17:47 +0300)]
Extend x86 to have different arch variants
Author: Negreanu Marius Adrian <adrian.m.negreanu@intel.com>
Author: Andrew Boie <andrew.p.boie@intel.com>
Author: Daniel Leung <daniel.leung@intel.com>
Currently, x86 target only has generic i686 and x86-atom
as arch variants. This patch adds the ability to have
more than two arch variants. Defining a new arch variant
is similiar to ARM targets, by adding a new file in
core/combo/arch/x86. These files also define what
capabilities the targeting CPU has (e.g. having SSE2,
SSE3, etc.).
We define arch variants for Sandy Bridge, Ivy Bridge,
Haswell; upcoming arches can be easily added to this
set with future patches.
Change-Id: Iafbce10d205e860738db4a216ff603f9a84d7311
Signed-off-by: Daniel Leung <daniel.leung@intel.com>
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
Ying Wang [Wed, 18 Sep 2013 16:02:03 +0000 (16:02 +0000)]
Merge "Remove unnecessary dependencies between host and target modules."
Ying Wang [Fri, 7 Jun 2013 01:05:53 +0000 (18:05 -0700)]
Remove unnecessary dependencies between host and target modules.
With this change, modules introduced by LOCAL_REQUIRED_MODULES will be
split by host/target: target modules only depend on target modules and
host modules only depend on host modules.
Bug:
9303948
Change-Id: I4078a7983aa3c00e99534f3f170dfe4b66b12287
Ying Wang [Mon, 16 Sep 2013 20:38:28 +0000 (20:38 +0000)]
Merge "Add support for WITHOUT_CLANG"
Mike Lockwood [Fri, 14 Jun 2013 17:52:50 +0000 (10:52 -0700)]
Add support for WITHOUT_CLANG
(cherry picked from commit
051a1740eb434e317451c09b72ae09c81cbfa1c1)
Change-Id: I60b7d1fa958557d13b74563c07f694b86d6a6d6f
Ying Wang [Sat, 14 Sep 2013 20:44:59 +0000 (20:44 +0000)]
Merge "Switch x86 default compiler to multilib version"
Ying Wang [Sat, 14 Sep 2013 00:41:30 +0000 (00:41 +0000)]
Merge "Fix parsing string parameters in BOARD_MKBOOTIMG_ARGS"
Andrew Hsieh [Fri, 13 Sep 2013 17:32:08 +0000 (17:32 +0000)]
Merge "Rename bin/clang to bin/analyzer"
Andrew Hsieh [Fri, 13 Sep 2013 07:49:39 +0000 (15:49 +0800)]
Rename bin/clang to bin/analyzer
Change-Id: Ie77018e4943823f7d0f18e9249f973a98ee3652a
Kenny Root [Thu, 12 Sep 2013 18:53:38 +0000 (18:53 +0000)]
Merge "Add libcore.conscrypt tests back to CTS"
Kenny Root [Thu, 5 Sep 2013 22:10:44 +0000 (15:10 -0700)]
Add libcore.conscrypt tests back to CTS
A reorganization of the libcore test jar files caused the Conscrypt
tests to be accidentally dropped from CTS. Add them back in their own
package.
(cherry picked from commit
69c00c9ee8e6f1d865db3bc61e16473bc64f7a28)
Bug:
10210673
Change-Id: I5ffc62736d3dab7e96e480c593e07d6c640b8950
Kenny Root [Thu, 12 Sep 2013 05:26:01 +0000 (05:26 +0000)]
Merge "Add Junit4 to the classpath for CollectAllTests"
Andrew Hsieh [Wed, 11 Sep 2013 00:07:27 +0000 (00:07 +0000)]
Merge "Add "WITH_STATIC_ANALYZER=1 m/mm/mmm/mma/mmma ...""
Kenny Root [Wed, 11 Sep 2013 00:00:33 +0000 (17:00 -0700)]
Add Junit4 to the classpath for CollectAllTests
This is needed for CollectAllTests to work with Junit4 tests.
Change-Id: I5e339022220b8e40bcb12337a09f3615dad7d53c
Andrew Hsieh [Tue, 10 Sep 2013 09:37:14 +0000 (17:37 +0800)]
Add "WITH_STATIC_ANALYZER=1 m/mm/mmm/mma/mmma ..."
The new option WITH_STATIC_ANALYZER=1 instructs build system to
run static analyzer via "clang --analyze" on a successful build.
If analyzer finds any issue, instruction to open report is displayed.
See http://clang-analyzer.llvm.org/scan-build.html for details.
WITH_STATIC_ANALYZER trumps WITH_SYNTAX_CHECK if both exist.
Project use lots of GCC extensions (eg. nested function) not supported
by clang may opt out by adding LOCAL_NO_STATIC_ANALYZER:=true
Change-Id: I9970560560bd52ce5f0fd7129c3488629627c735
Andrew Hsieh [Wed, 4 Sep 2013 21:57:50 +0000 (21:57 +0000)]
Merge "Add "WITH_SYNTAX_CHECK=1 make ...""
Ying Wang [Wed, 4 Sep 2013 18:50:48 +0000 (18:50 +0000)]
Merge "FDO: Only support locally"
Andrew Hsieh [Tue, 27 Aug 2013 09:33:06 +0000 (17:33 +0800)]
Add "WITH_SYNTAX_CHECK=1 make ..."
The new option WITH_SYNTAX_CHECK=1 instructs build system to invoke
"clang -fsyntax-only" to utilize clang's better diagnostics before calling
LOCAL_CC/LOCAL_CXX for code generation. The compilation time is slightly
longer, and the generated object file should be the same as w/o WITH_SYNTAX_CHECK
Project use lots of GCC extensions (eg. nested function) not supported
by clang may opt out by adding LOCAL_NO_SYNTAX_CHECK:=true
Change-Id: I5689586788ef049bd967364f71f31f1e359bd121
synergydev [Wed, 14 Aug 2013 00:41:52 +0000 (17:41 -0700)]
FDO: Only support locally
The issues:
- The size increase from utilizing FDO is quite large while
utilizing runtime profiles in build.
- By default, FDO is utilized globally if the target arch variant
profiles exist.
- Not all modules can show statistical significance in
performance comparison, yet still suffer the size increase.
The solution:
- Only enable FDO locally with LOCAL_FDO_SUPPORT
for modules which may benefit enough to justify the size
tradeoff.
Solution notes:
- I've noted statistical significance in libwebcore and libskia
thus far from utilizing FDO.
- Analysis included sunspider, drawcanvas benchmarks, as
well as gooda analysis on both arm and x86
- To support runtime profile generation in modules which have
LOCAL_FDO_SUPPORT specified,
BUILD_FDO_INSTRUMENTATION is still used. Otherwise,
if the target arch variant profiles exist, FDO is utilized for
specified modules.
Change-Id: I7e95266943ff47c7d82b02e6200fd09911d0bb57
Ben Cheng [Wed, 28 Aug 2013 18:26:58 +0000 (18:26 +0000)]
Merge "Re-tighten default compiler options."
Ben Cheng [Wed, 28 Aug 2013 18:00:54 +0000 (11:00 -0700)]
Re-tighten default compiler options.
Remove "-Wno-unused-parameter -Wno-unused-but-set-parameter" added for
GCC 4.8 experiment.
BUG:
10495043
(cherry picked from internal master
1cea0755f400c1d183d22679d5b931c3a04ae4a4)
Change-Id: Ifa221709b1351a9268c06872e2b667138995c3da
Jianxun Zhang [Wed, 17 Apr 2013 22:19:19 +0000 (15:19 -0700)]
Fix parsing string parameters in BOARD_MKBOOTIMG_ARGS
The existing logic in common.py breaks string arguments incorrectly:
e.g. --para1 val1 --para2 "val2 is a string" will be output as:
'--para', 'val1, '--para2', 'val2' 'is' 'a' 'string'
This will cause mkbootimg command fails due to the invalid arguments
generated from the wrong parsing.
The patch fixes this issue to get:
'--para', 'val1, '--para2', 'val2 is a string'
Change-Id: Ia34ec357550f11ae9d6adc719d86a0c6a9099fbc
Signed-off-by: Jianxun Zhang <jianxun.zhang@intel.com>
Geremy Condra [Mon, 26 Aug 2013 21:45:52 +0000 (21:45 +0000)]
Merge "Hmm, contrary to Deckard's assurances, this broke internally. Reverting."
Geremy Condra [Mon, 26 Aug 2013 21:27:56 +0000 (21:27 +0000)]
Hmm, contrary to Deckard's assurances, this broke internally. Reverting.
Change-Id: I0d7892cd619e742fb5d6b1bda6d0dba7d6cd47bf
Geremy Condra [Mon, 26 Aug 2013 21:16:34 +0000 (21:16 +0000)]
Merge "Add sepolicy_version to PRODUCT_PACKAGES"
Pavel Chupin [Fri, 23 Aug 2013 12:49:21 +0000 (16:49 +0400)]
Switch x86 default compiler to multilib version
Switch from gcc-4.7 32-bit only to gcc-4.7 multilib (32/x32/64) compiler.
Tested x86 image build on Linux and Darwin.
This bionic patch is required:
https://android-review.googlesource.com/#/c/64183
Change-Id: Ifc2c6c5d6a4a1b71a00a87af072bb7f67b1c284d
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
William Roberts [Sat, 11 May 2013 18:21:18 +0000 (11:21 -0700)]
Add sepolicy_version to PRODUCT_PACKAGES
Change-Id: I3d2652dd594d272507c0a1485e21227149ee4af7
Signed-off-by: William Roberts <wroberts@tresys.com>
Ying Wang [Wed, 21 Aug 2013 19:42:14 +0000 (19:42 +0000)]
Merge "Adding the missing audio files into the SDK system image"
Ying Wang [Mon, 19 Aug 2013 23:16:27 +0000 (23:16 +0000)]
Merge "[MIPS] Add support for MXU instructions for Ingenic builds."
Ying Wang [Mon, 19 Aug 2013 21:24:07 +0000 (21:24 +0000)]
Merge "mkbootimg: Support custom mkbootimg implementation"
Pete Delaney [Fri, 16 Aug 2013 01:26:14 +0000 (18:26 -0700)]
[MIPS] Add support for MXU instructions for Ingenic builds.
This enables an Ingenic build to use MXU asm instructions.
MXU support was just recently added:
ASM: https://android-review.googlesource.com/63701
GCC: https://android-review.googlesource.com/63702
BIN: https://android-review.googlesource.com/#/c/63704/
Change-Id: I2b60567a689efa70ec064dfbb0f241a6bc61aed1
Signed-off-by: Pete Delaney <piet.delaney@imgtec.com>
Ying Wang [Wed, 14 Aug 2013 01:25:05 +0000 (01:25 +0000)]
Merge "Add missing LOCAL_ADDITIONAL_DEPENDENCIES dependency to BUILD_PREBUILT."
Elliott Hughes [Wed, 14 Aug 2013 00:05:34 +0000 (17:05 -0700)]
Add missing LOCAL_ADDITIONAL_DEPENDENCIES dependency to BUILD_PREBUILT.
Change-Id: Id7c0e77110653e618d783026cd4b4aeadb3c45ec
Ying Wang [Tue, 13 Aug 2013 21:59:26 +0000 (21:59 +0000)]
Merge "Prepare upcoming GCC 4.8 release."
Ben Cheng [Tue, 13 Aug 2013 21:38:15 +0000 (14:38 -0700)]
Prepare upcoming GCC 4.8 release.
o Add -Wno-unused-parameter -Wno-unused-but-set-parameter to suppress
new warnings.
o Define GCC_COLORS to enable colorful diagnostic messages.
Change-Id: Icbd62300b0e6f39d4e514edec2431a06b4d72421
(cherry picked from internal commit
ccd8e6082b5b1e519a75068fa6c887a1a85b53c4)
Ying Wang [Tue, 13 Aug 2013 17:38:36 +0000 (17:38 +0000)]
Merge "FDO: support linux-x86 target"
Bjorn Andersson [Mon, 26 Nov 2012 00:53:44 +0000 (16:53 -0800)]
mkbootimg: Support custom mkbootimg implementation
Support using custom mkbootimg to allow boards to specify custom
boot image formats. Also export this as the environment variable
MKBOOTIMG to the *_from_target_files releasetools scripts.
Change-Id: I2084273b1175de097fb7da5c4f2264ea8014d74f
Signed-off-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
synergydev [Thu, 8 Aug 2013 20:08:26 +0000 (13:08 -0700)]
FDO: support linux-x86 target
Change-Id: I4a3a1d298176da109df316cf9128f19e77490bc9
Ying Wang [Fri, 9 Aug 2013 20:33:10 +0000 (20:33 +0000)]
Merge "Link PRIVATE_TARGET_FDO_LIB before shared libraries"
Ying Wang [Fri, 9 Aug 2013 19:42:09 +0000 (19:42 +0000)]
Merge "Modify release tools to replace certs in MMAC files."
Robert Craig [Fri, 19 Apr 2013 14:59:22 +0000 (10:59 -0400)]
Modify release tools to replace certs in MMAC files.
Added support to perform a string replace of specified
dev keys with release keys when using the release tool
scripts.
Change-Id: Id0e945b0d62720c41f5ca9764a00de4bcdecaab4
Signed-off-by: rpcraig <rpcraig@tycho.ncsc.mil>
Ying Wang [Thu, 8 Aug 2013 18:54:20 +0000 (18:54 +0000)]
Merge "FDO: do not support host modules"
synergydev [Wed, 7 Aug 2013 07:00:39 +0000 (00:00 -0700)]
Link PRIVATE_TARGET_FDO_LIB before shared libraries
For global declaration of FDO profile generation and usage,
we need to link PRIVATE_TARGET_FDO_LIB (libgcov.a by default)
prior to linking shared libraries.
TARGET_FDO_LIB is set if feedback directed optimizations
are in use, so we do not need to worry about consistent size
increases from this change.
Change-Id: I543903f58893816f037c9466f31b19dfe822fdf4
Jun Tian [Tue, 6 Aug 2013 02:27:48 +0000 (10:27 +0800)]
Adding the missing audio files into the SDK system image
The system audio files are not included in the SDK image makefile.
It causes the audio effects cannot be played in the SDK image.
It also fixed lots of error messages in the logcat.
Change-Id: I1670b2b9e4f8fe6709cd68b8e792e2f8c289876f
synergydev [Mon, 5 Aug 2013 09:44:37 +0000 (02:44 -0700)]
FDO: do not support host modules
Summary:
If built with BUILD_FDO_INSTRUMENT alone, host modules will fail at runtime (during build)
due to failing to create /data in most standard unix user permission cases. If the user does
have full permission to /, /data/profile/ will be created and profiles will be generated there.
Any file generation in the Android Build System should be kept to $OUT.
This commit fixes this bug.
Test Plan:
Build with BUILD_FDO_INSTRUMENT without additional configuration, and host modules will no longer generate profiles
at their runtime.
Ying Wang [Fri, 2 Aug 2013 17:53:15 +0000 (17:53 +0000)]
Merge "Remove BUILD_HOST_JAVA_LIBRARY dependency on aapt"
Brian Carlstrom [Fri, 2 Aug 2013 06:31:19 +0000 (23:31 -0700)]
Remove BUILD_HOST_JAVA_LIBRARY dependency on aapt
Change-Id: I8be48114b43e46255977be1677b0c0bbccdf9163
Elliott Hughes [Wed, 31 Jul 2013 22:35:47 +0000 (22:35 +0000)]
Merge "Remove the bogus icu.dat dependency."
Elliott Hughes [Wed, 31 Jul 2013 22:02:17 +0000 (15:02 -0700)]
Remove the bogus icu.dat dependency.
Simply depending on the icu4c libraries now pulls in the appropriate
data files for you.
Change-Id: Ied659584b2583c92d871c5823988ce0a865eabe4
Jean-Baptiste Queru [Tue, 30 Jul 2013 14:26:44 +0000 (14:26 +0000)]
Merge "Added generic hook for loading vendor specific defintions"
Marie Lennerhagen [Wed, 20 Oct 2010 11:41:59 +0000 (13:41 +0200)]
Added generic hook for loading vendor specific defintions
Change-Id: I6dec9c378ed0aabf9e60f8dcb05c6043bbcc30e5
Ying Wang [Thu, 25 Jul 2013 22:32:08 +0000 (22:32 +0000)]
Merge "Allow proto builds to pass in java proto params."
Ulas Kirazci [Thu, 25 Jul 2013 19:28:19 +0000 (12:28 -0700)]
Allow proto builds to pass in java proto params.
Change-Id: I65fe0cd96f818f59267da6159e6bd2ad28f07a11
Ulas Kirazci [Thu, 25 Jul 2013 20:31:44 +0000 (20:31 +0000)]
Merge "Revert "Allow proto builds to pass in java proto params.""
Ulas Kirazci [Thu, 25 Jul 2013 19:35:28 +0000 (19:35 +0000)]
Revert "Allow proto builds to pass in java proto params."
This reverts commit
28b46fc16c026365378909f1cc88fad0d3b2395c.
Change-Id: Iaca9fa749c6f460911cc46e08e6b3ae2555b8bcc
Jean-Baptiste Queru [Thu, 25 Jul 2013 16:01:45 +0000 (16:01 +0000)]
Merge "Change build id to OPENMASTER"
Chirayu Desai [Fri, 16 Nov 2012 11:41:17 +0000 (17:11 +0530)]
Change build id to OPENMASTER
Change-Id: Ib1b2ea0303619753dace8a776295ad4e1ceab096
Ulas Kirazci [Thu, 25 Jul 2013 03:04:10 +0000 (03:04 +0000)]
Merge "Allow proto builds to pass in java proto params."
Ying Wang [Thu, 25 Jul 2013 01:54:44 +0000 (01:54 +0000)]
Merge "Use consistent search depth."
Ulas Kirazci [Wed, 24 Jul 2013 21:32:14 +0000 (14:32 -0700)]
Allow proto builds to pass in java proto params.
Also source files which have dependencies need to be bundled together
(at least the way the build system is set up now). Move
--proto_path=$(TOP) to the end so that it does not take precedence
over user-supplied --proto_path flags.
Change-Id: Ia532647fe8811d39230a23ba3671685b0388cbe0
Guilhem IMBERTON [Thu, 4 Oct 2012 12:26:57 +0000 (14:26 +0200)]
Use consistent search depth.
AndroidProducts.mk allows for a maxdepth of 4 in device and vendor while
vendorsetup.sh and BoardConfig.mk only allow for smaller depth.
Make search depth consistent for these files.
Change-Id: I406770c1423d4f27fe097956a7c705a0da937e35
Signed-off-by: Beare, Bruce J <bruce.j.beare@intel.com>
Signed-off-by: Laurent Fert <laurent.fert@intel.com>
Signed-off-by: Guilhem Imberton <guilhem.imberton@intel.com>
Author: Laurent Fert <laurent.fert@intel.com>
Ying Wang [Thu, 18 Jul 2013 17:02:45 +0000 (10:02 -0700)]
am
a1f8cdf7: Merge "Allow several system property files"
* commit '
a1f8cdf74bcc35110bd306d633e019a6279fc7fe':
Allow several system property files
Ying Wang [Thu, 18 Jul 2013 17:00:19 +0000 (17:00 +0000)]
Merge "Allow several system property files"
The Android Open Source Project [Tue, 16 Jul 2013 18:19:11 +0000 (11:19 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I8a36562b71e8ca51a52e9e893f3fb302ea414f24
Johan Redestig [Thu, 12 Apr 2012 15:00:58 +0000 (17:00 +0200)]
Allow several system property files
TARGET_SYSTEM_PROP now is a list of files and all of them
are included in the build.prop.
Change-Id: I494f86412b0a299ee4c066e49ab4f4686bc2178a
The Android Automerger [Tue, 16 Jul 2013 03:56:09 +0000 (20:56 -0700)]
JSS15B
Scott Main [Mon, 15 Jul 2013 21:21:00 +0000 (14:21 -0700)]
am
d67d0227: Merge changes Id6de3e74,I1e96cbd7 into jb-mr2-dev
* commit '
d67d02274da846184449ac02aba7eafdcba889b1':
fix design/develop boxes float
add style to add nexus 4 frame to screenshots