Yohann Roussel
8c8c868180
Merge changes from topic \'jack-server-1.3-a3\'
...
am: e0c7b4ec96
* commit 'e0c7b4ec96d4aa584f79a24aea7c682a114143d8':
Remove LOCAL_JACK_EXTRA_ARGS
Allow control of jack used for compilation
Clean call-jack and its callers
2015-10-22 10:50:40 +00:00
Yohann Roussel
e0c7b4ec96
Merge changes from topic 'jack-server-1.3-a3'
...
* changes:
Remove LOCAL_JACK_EXTRA_ARGS
Allow control of jack used for compilation
Clean call-jack and its callers
2015-10-22 10:46:37 +00:00
caozhiyuan
21b37d83eb
Fix calculation of stashed blocks.
...
Change-Id: Ic3d607cb6691fc58e189a54a7244942cf3f3c387
Signed-off-by: caozhiyuan <cao.zhiyuan@zte.com.cn>
2015-10-22 09:57:10 +08:00
Tao Bao
4fcb77e4e3
blockimgdiff.py: Fix the script error for BBOTA v1.
...
CL in [1] added an assertion to make sure an empty RangeSet cannot call
RangeSet.to_raw_string(). However, we may unintentionally hit that when
generating BBOTA v1 script (e.g. for "new" commands that always have
empty src_ranges).
[1] commit e8f756137c
Change-Id: I1723606967f354ace9286d2b888fdbc80ba10e39
2015-10-21 17:03:18 -07:00
Nick Kralevich
c6c5b1a969
Merge "allow qemu_props to set opengles.version"
...
am: c5a33b0570
* commit 'c5a33b057071a0c2ea0374bbb28ba02ba2495aba':
allow qemu_props to set opengles.version
2015-10-21 18:19:49 +00:00
Nick Kralevich
c5a33b0570
Merge "allow qemu_props to set opengles.version"
2015-10-21 18:10:53 +00:00
Nick Kralevich
ce1062629f
allow qemu_props to set opengles.version
...
Addresses the following denial:
init: avc: denied { set } for property=opengles.version scontext=u:r:qemu_props:s0 tcontext=u:object_r:default_prop:s0 tclass=property_service
Bug: 25148690
Change-Id: I4b197eeabfe37e794104e4e686e9e388b5bc3e0c
2015-10-21 10:55:21 -07:00
Stephen Hines
adb12a039a
Merge "Revert "Switch from clang 3.6 to new clang repository (with 3.8).""
...
am: a7918b4948
* commit 'a7918b49488ad0daed6def7459fbf0f9d281b4b5':
Revert "Switch from clang 3.6 to new clang repository (with 3.8)."
2015-10-21 16:39:12 +00:00
Stephen Hines
a7918b4948
Merge "Revert "Switch from clang 3.6 to new clang repository (with 3.8).""
2015-10-21 16:29:28 +00:00
Stephen Hines
f7dbab16ff
Revert "Switch from clang 3.6 to new clang repository (with 3.8)."
...
This reverts commit 1332828b6e
.
Bug: 25141123
Change-Id: Idd5d8757095b2b370046a84aea76bc95e16f3876
2015-10-21 09:09:38 -07:00
Yohann Roussel
6528ea3086
Remove LOCAL_JACK_EXTRA_ARGS
...
Use of DEFAULT_JACK_EXTRA_ARGS and LOCAL_JACK_FLAGS provides all needed
support.
(cherry picked from commit d2b2983cc7
)
Change-Id: I1cd76836792e7332bc3750408a860400b0957485
2015-10-21 17:22:27 +02:00
Yohann Roussel
8998d57404
Allow control of jack used for compilation
...
Version of Jack used to compile a module can now be control from
a dedicated mk located in prebuilts/sdk/tools
Bug: 24564814
(cherry picked from commit b68c9a498d
)
Change-Id: I7809dc966026ff94b5cb2daa7e2c63762ca4768d
2015-10-21 17:22:05 +02:00
Yohann Roussel
b2c5558435
Clean call-jack and its callers
...
This is possible now that we have the new Jack server.
Also fix dependency from dex/jack target to jack script
instead of jack.jar.
(cherry picked from commit 5e50b34221
)
Change-Id: I8e7aa5087ba8d73cc93140ddfca8f4ab2f505175
2015-10-21 17:02:25 +02:00
Stephen Hines
bbbd421809
Merge "Switch from clang 3.6 to new clang repository (with 3.8)."
...
am: f5782d6097
* commit 'f5782d609724b5f41506433392ca51e1bed9c828':
Switch from clang 3.6 to new clang repository (with 3.8).
2015-10-21 00:22:02 +00:00
Colin Cross
8b63d67e1b
Merge changes I2ba90314,I5f47307d
...
am: fc8b331858
* commit 'fc8b331858747f8207e3861c0ada2c4fd359f648':
makeparallel: prepend flags to ninja command line
Put NINJA_ARGS last
2015-10-21 00:21:52 +00:00
Stephen Hines
f5782d6097
Merge "Switch from clang 3.6 to new clang repository (with 3.8)."
2015-10-21 00:18:05 +00:00
Colin Cross
fc8b331858
Merge changes I2ba90314,I5f47307d
...
* changes:
makeparallel: prepend flags to ninja command line
Put NINJA_ARGS last
2015-10-21 00:15:33 +00:00
Colin Cross
466ea35202
makeparallel: prepend flags to ninja command line
...
Ninja stops parsing top level options after -t is used to select a
tool. Put any inserted command line options at the beginning of the
command.
Change-Id: I2ba903143366aaded63e21d749476248617c8962
2015-10-20 17:05:49 -07:00
Andreas Gampe
3c131856ee
Merge "Build: Fix DEX2OAT_TARGET_CPU_VARIANT setting"
...
am: 6c45f4493e
* commit '6c45f4493e125f4632ee0d0ed95d0198018cbb80':
Build: Fix DEX2OAT_TARGET_CPU_VARIANT setting
2015-10-20 23:50:59 +00:00
Andreas Gampe
6c45f4493e
Merge "Build: Fix DEX2OAT_TARGET_CPU_VARIANT setting"
2015-10-20 23:37:36 +00:00
Colin Cross
88dc18a319
Put NINJA_ARGS last
...
Put NINJA_ARGS at the end of the command line so it can contain tools,
which expect to be last.
Change-Id: I5f47307d01aa52eb74a333b19ffe3a7cd8950b01
2015-10-20 15:12:12 -07:00
Roland Levillain
fef5ba8ec7
Merge "Typos in envsetup.sh."
...
am: 8503cfb49c
* commit '8503cfb49c797bffa2568cffaab483071230fef0':
Typos in envsetup.sh.
2015-10-20 21:44:10 +00:00
Roland Levillain
8503cfb49c
Merge "Typos in envsetup.sh."
2015-10-20 21:30:10 +00:00
Dan Willemsen
b93e8250d7
Merge "Stop encoding absolute paths in symbols"
...
am: 9f576acde6
* commit '9f576acde6c27149c9ca563f0a73e9f1c5e0e768':
Stop encoding absolute paths in symbols
2015-10-20 20:52:09 +00:00
Dan Willemsen
9f576acde6
Merge "Stop encoding absolute paths in symbols"
2015-10-20 20:46:21 +00:00
Chih-hung Hsieh
ebfadd8990
Merge "Move x86 target to clang by default."
...
am: a993bfff36
* commit 'a993bfff361b22902387fc66d734abe385ca3338':
Move x86 target to clang by default.
2015-10-20 20:12:12 +00:00
Chih-hung Hsieh
a993bfff36
Merge "Move x86 target to clang by default."
2015-10-20 19:47:55 +00:00
Chih-Hung Hsieh
f0ba2e9da6
Move x86 target to clang by default.
...
Bug: 23163853
Change-Id: Ib5e9beddbeca8968d6e4365abeb44ae97cbe9981
2015-10-20 12:16:57 -07:00
Roland Levillain
39341924db
Typos in envsetup.sh.
...
Change-Id: I31cc811e1352b9c924bdf164561f334b032d6f5c
2015-10-20 12:51:06 +01:00
Andreas Gampe
847b00bf1b
Build: Fix DEX2OAT_TARGET_CPU_VARIANT setting
...
The secondary variant fallback was not set. The build system expects
the variants, so system properties were malformed for x86-64:
[dalvik.vm.isa.x86.variant]: [dalvik.vm.isa.x86.features=default]
Bug: 24989387
Change-Id: Idbf54f81494f2650ad56080305807fd6b7ed4161
2015-10-19 18:21:18 -07:00
Christopher Wiley
487cc7beaf
Merge "Invoke the aidl-cpp compiler to generate C++"
...
am: ba39c5690a
* commit 'ba39c5690aae0bcd7102c0030a31b705ce1b92f1':
Invoke the aidl-cpp compiler to generate C++
2015-10-19 23:49:58 +00:00
Christopher Wiley
ba39c5690a
Merge "Invoke the aidl-cpp compiler to generate C++"
2015-10-19 23:44:21 +00:00
Ying Wang
3a6ad87039
Merge "envsetup: Show error when supplied dir isn\'t present with mmm"
...
am: 475054a16a
* commit '475054a16ad57b184fa476c093cf1ce8e9ec3e15':
envsetup: Show error when supplied dir isn't present with mmm
2015-10-19 23:21:46 +00:00
Christopher Wiley
2df75d17a8
Invoke the aidl-cpp compiler to generate C++
...
Bug: 23599697
Test: test application compiles generated code
Change-Id: I35255517dd0b7ef7a82134be1c862093eaa3ce6b
2015-10-19 16:18:03 -07:00
Ying Wang
475054a16a
Merge "envsetup: Show error when supplied dir isn't present with mmm"
2015-10-19 22:44:03 +00:00
Dan Willemsen
3fc56a1fa1
am 77493047
: Merge "Add support for LOCAL_SRC_FILES_EXCLUDE"
...
* commit '7749304741070af8239e02f68d688fc45fd877d1':
Add support for LOCAL_SRC_FILES_EXCLUDE
2015-10-19 14:24:53 -07:00
Dan Willemsen
7749304741
Merge "Add support for LOCAL_SRC_FILES_EXCLUDE"
2015-10-19 21:21:40 +00:00
Abhinav1997
a72a6e7c72
envsetup: Show error when supplied dir isn't present with mmm
...
When a directory isn't present with mmm, don't show "No Android.mk present", rather show that the directory isn't present
Change-Id: I7259a60012c6f30c470daa60d5a5097d01ffc4c7
Signed-off-by: Abhinav1997 <abhinav.jhanwar.august2@gmail.com>
2015-10-19 22:38:42 +02:00
Sami Tolvanen
58a748d37e
am 87f58261
: Merge "Error correction: Append codes to verified partitions"
...
* commit '87f582611a5a5c23abf3237abe0e467e46111567':
Error correction: Append codes to verified partitions
2015-10-19 02:55:51 -07:00
Sami Tolvanen
87f582611a
Merge "Error correction: Append codes to verified partitions"
2015-10-19 09:49:18 +00:00
Ying Wang
cd9545a499
am 4f6f0f92
: Merge "If a console doesn\'t exist, read password from stdin."
...
* commit '4f6f0f924eba9f80493861a9e7ff7f40f9924aa2':
If a console doesn't exist, read password from stdin.
2015-10-18 10:12:27 -07:00
Ying Wang
4f6f0f924e
Merge "If a console doesn't exist, read password from stdin."
2015-10-18 17:07:28 +00:00
Colin Cross
a04abc8e23
Add support for LOCAL_SRC_FILES_EXCLUDE
...
LOCAL_SRC_FILES_EXCLUDE will be used to filter files out of
LOCAL_SRC_FILES. A common usage will be to use
LOCAL_SRC_FILES_EXCLUDE_<arch> to remove a source file that will be
replaced with an arch-optimized version.
Change-Id: I75cc6114c47fb784bab65cae8f618c4f395f07bb
2015-10-16 17:33:01 -07:00
Tao Bao
6ce8ae761b
am ac39bef4
: Merge "common.py: Fix the build."
...
* commit 'ac39bef43fb032bff75b8558f54107e733355265':
common.py: Fix the build.
2015-10-16 15:46:31 -07:00
Tao Bao
ac39bef43f
Merge "common.py: Fix the build."
2015-10-16 22:41:45 +00:00
Tao Bao
aac4ad56b6
common.py: Fix the build.
...
Should only use source_info_dict when creating incremental OTAs.
Change-Id: I6a4e5f8fa3613a1b36563ec915e433247965a2b8
2015-10-16 15:28:00 -07:00
Tao Bao
63e63c2a07
am 543b28d4
: Merge "Pass source\'s info_dict to vendor\'s releasetools.py."
...
* commit '543b28d42f8fdebe011a906826251ab8df70a226':
Pass source's info_dict to vendor's releasetools.py.
2015-10-16 14:49:40 -07:00
Tao Bao
543b28d42f
Merge "Pass source's info_dict to vendor's releasetools.py."
2015-10-16 21:42:34 +00:00
Ying Wang
19fcc054bd
am 19e4741d
: Merge "Use direct dependency on the JNI so files."
...
* commit '19e4741df60643d4fdb876e77069bb63857a12b2':
Use direct dependency on the JNI so files.
2015-10-16 01:25:15 +00:00
Ying Wang
19e4741df6
Merge "Use direct dependency on the JNI so files."
2015-10-16 01:19:48 +00:00