OSDN Git Service
Yohann Roussel [Thu, 22 Oct 2015 11:39:05 +0000 (11:39 +0000)]
Merge changes from topic \'jack-server-1.3-a3\' am:
e0c7b4ec96 am:
8c8c868180
am:
ffb1c9cf5f -s ours
* commit '
ffb1c9cf5f79d9ad59087d8fcc8dc621583a3e69':
Remove LOCAL_JACK_EXTRA_ARGS
Allow control of jack used for compilation
Clean call-jack and its callers
Yohann Roussel [Thu, 22 Oct 2015 10:53:20 +0000 (10:53 +0000)]
Merge changes from topic \'jack-server-1.3-a3\' am:
e0c7b4ec96
am:
8c8c868180
* commit '
8c8c8681805b51fd42c01cdf42ba19e74ef72e52':
Remove LOCAL_JACK_EXTRA_ARGS
Allow control of jack used for compilation
Clean call-jack and its callers
Yohann Roussel [Thu, 22 Oct 2015 10:50:40 +0000 (10:50 +0000)]
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
Yohann Roussel [Thu, 22 Oct 2015 10:46:37 +0000 (10:46 +0000)]
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
Ying Wang [Wed, 21 Oct 2015 21:20:38 +0000 (21:20 +0000)]
Merge "Fix cts split apk testcase copy pattern rule."
Ying Wang [Wed, 21 Oct 2015 21:14:50 +0000 (14:14 -0700)]
Fix cts split apk testcase copy pattern rule.
Bug:
21762834
Change-Id: Ib8ff956685c898132a11de45a0d7cfdd1009f48c
Nick Kralevich [Wed, 21 Oct 2015 18:29:12 +0000 (18:29 +0000)]
Merge "allow qemu_props to set opengles.version" am:
c5a33b0570 am:
c6c5b1a969
am:
58ddb6d8e8
* commit '
58ddb6d8e8e66e94594a26bbed9679a2bef2a6db':
allow qemu_props to set opengles.version
Nick Kralevich [Wed, 21 Oct 2015 18:24:21 +0000 (18:24 +0000)]
Merge "allow qemu_props to set opengles.version" am:
c5a33b0570
am:
c6c5b1a969
* commit '
c6c5b1a9692596f06a993db2d1ba810e44716cbd':
allow qemu_props to set opengles.version
Nick Kralevich [Wed, 21 Oct 2015 18:19:49 +0000 (18:19 +0000)]
Merge "allow qemu_props to set opengles.version"
am:
c5a33b0570
* commit '
c5a33b057071a0c2ea0374bbb28ba02ba2495aba':
allow qemu_props to set opengles.version
Nick Kralevich [Wed, 21 Oct 2015 18:10:53 +0000 (18:10 +0000)]
Merge "allow qemu_props to set opengles.version"
Nick Kralevich [Wed, 21 Oct 2015 17:55:21 +0000 (10:55 -0700)]
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
Ying Wang [Wed, 21 Oct 2015 17:49:39 +0000 (17:49 +0000)]
Merge "Add LOCAL_FINDBUGS_FLAGS to support custom findbugs flags."
Ying Wang [Wed, 21 Oct 2015 17:49:23 +0000 (17:49 +0000)]
Merge "Set up CTS copy rules only once for multilib build."
Ying Wang [Wed, 21 Oct 2015 17:30:51 +0000 (10:30 -0700)]
Add LOCAL_FINDBUGS_FLAGS to support custom findbugs flags.
Use LOCAL_FINDBUGS_FLAGS to specify findbugs command line flags.
To use findbugs filters:
LOCAL_FINDBUGS_FLAGS := -exclude $(LOCAL_PATH)/exclude.xml -include \
$(LOCAL_PATH)/include.xml
where exclude.xml and include.xml are filter files.
The build system automatically adds the filter files as dependency of
findbugs' output xml.
Bug:
24948760
Change-Id: I82502c0ade910c5255001fa5f390316137ce0be6
Stephen Hines [Wed, 21 Oct 2015 16:52:42 +0000 (16:52 +0000)]
Merge "Revert "Switch from clang 3.6 to new clang repository (with 3.8)."" am:
a7918b4948 am:
adb12a039a
am:
4647caa921
* commit '
4647caa9214150f892c050f0986cf9b7e71b1a46':
Revert "Switch from clang 3.6 to new clang repository (with 3.8)."
Stephen Hines [Wed, 21 Oct 2015 16:46:29 +0000 (16:46 +0000)]
Merge "Revert "Switch from clang 3.6 to new clang repository (with 3.8)."" am:
a7918b4948
am:
adb12a039a
* commit '
adb12a039ab34f1b9a33f933a249b0c86e389737':
Revert "Switch from clang 3.6 to new clang repository (with 3.8)."
Stephen Hines [Wed, 21 Oct 2015 16:39:12 +0000 (16:39 +0000)]
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)."
Stephen Hines [Wed, 21 Oct 2015 16:29:28 +0000 (16:29 +0000)]
Merge "Revert "Switch from clang 3.6 to new clang repository (with 3.8).""
Stephen Hines [Wed, 21 Oct 2015 15:32:45 +0000 (08:32 -0700)]
Revert "Switch from clang 3.6 to new clang repository (with 3.8)."
This reverts commit
1332828b6ea25250c497609a1d4b2c7e28227ff9.
Bug:
25141123
Change-Id: Idd5d8757095b2b370046a84aea76bc95e16f3876
Yohann Roussel [Mon, 12 Oct 2015 16:02:51 +0000 (18:02 +0200)]
Remove LOCAL_JACK_EXTRA_ARGS
Use of DEFAULT_JACK_EXTRA_ARGS and LOCAL_JACK_FLAGS provides all needed
support.
(cherry picked from commit
d2b2983cc791f90a0d052699603723335ab94f5a)
Change-Id: I1cd76836792e7332bc3750408a860400b0957485
Yohann Roussel [Fri, 3 Jul 2015 13:46:51 +0000 (15:46 +0200)]
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
b68c9a498d1e2c631eb6e8c9092d4d5775402083)
Change-Id: I7809dc966026ff94b5cb2daa7e2c63762ca4768d
Yohann Roussel [Thu, 2 Jul 2015 10:10:17 +0000 (12:10 +0200)]
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
5e50b342218fe2b9c1af20fd7da3c173bfac0499)
Change-Id: I8e7aa5087ba8d73cc93140ddfca8f4ab2f505175
Ying Wang [Wed, 21 Oct 2015 01:18:40 +0000 (18:18 -0700)]
Set up CTS copy rules only once for multilib build.
Bug:
21762834
Change-Id: I488893b2fd26c9aaeb92ae494bc46e86dad1622d
Stephen Hines [Wed, 21 Oct 2015 00:34:27 +0000 (00:34 +0000)]
Merge "Switch from clang 3.6 to new clang repository (with 3.8)." am:
f5782d6097 am:
bbbd421809
am:
44fd42d6af
* commit '
44fd42d6afdd135c2e6760296c88f0af3fab1236':
Switch from clang 3.6 to new clang repository (with 3.8).
Colin Cross [Wed, 21 Oct 2015 00:34:21 +0000 (00:34 +0000)]
Merge changes I2ba90314,I5f47307d am:
fc8b331858 am:
8b63d67e1b
am:
5538dc8bfe
* commit '
5538dc8bfec3d92be8c982d439488ba44431890f':
makeparallel: prepend flags to ninja command line
Put NINJA_ARGS last
Stephen Hines [Wed, 21 Oct 2015 00:27:01 +0000 (00:27 +0000)]
Merge "Switch from clang 3.6 to new clang repository (with 3.8)." am:
f5782d6097
am:
bbbd421809
* commit '
bbbd42180952996fcfbde9a181ddddef7b415491':
Switch from clang 3.6 to new clang repository (with 3.8).
Colin Cross [Wed, 21 Oct 2015 00:26:52 +0000 (00:26 +0000)]
Merge changes I2ba90314,I5f47307d am:
fc8b331858
am:
8b63d67e1b
* commit '
8b63d67e1ba42d090e19cae32e802117b9cac852':
makeparallel: prepend flags to ninja command line
Put NINJA_ARGS last
Stephen Hines [Wed, 21 Oct 2015 00:22:02 +0000 (00:22 +0000)]
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).
Colin Cross [Wed, 21 Oct 2015 00:21:52 +0000 (00:21 +0000)]
Merge changes I2ba90314,I5f47307d
am:
fc8b331858
* commit '
fc8b331858747f8207e3861c0ada2c4fd359f648':
makeparallel: prepend flags to ninja command line
Put NINJA_ARGS last
Stephen Hines [Wed, 21 Oct 2015 00:18:05 +0000 (00:18 +0000)]
Merge "Switch from clang 3.6 to new clang repository (with 3.8)."
Colin Cross [Wed, 21 Oct 2015 00:15:33 +0000 (00:15 +0000)]
Merge changes I2ba90314,I5f47307d
* changes:
makeparallel: prepend flags to ninja command line
Put NINJA_ARGS last
Colin Cross [Tue, 20 Oct 2015 22:41:05 +0000 (15:41 -0700)]
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
Andreas Gampe [Tue, 20 Oct 2015 23:59:45 +0000 (23:59 +0000)]
Merge "Build: Fix DEX2OAT_TARGET_CPU_VARIANT setting" am:
6c45f4493e am:
3c131856ee
am:
92a73a0f6c
* commit '
92a73a0f6c0c768d4bc612106e0c6ddcb7fb2846':
Build: Fix DEX2OAT_TARGET_CPU_VARIANT setting
Roland Levillain [Tue, 20 Oct 2015 23:59:13 +0000 (23:59 +0000)]
Merge "Typos in envsetup.sh." am:
8503cfb49c am:
fef5ba8ec7
am:
7f07d0bc4d
* commit '
7f07d0bc4d0af99ada46a540ed67118defe65dc4':
Typos in envsetup.sh.
Dan Willemsen [Tue, 20 Oct 2015 23:59:05 +0000 (23:59 +0000)]
Merge "Stop encoding absolute paths in symbols" am:
9f576acde6 am:
b93e8250d7
am:
05af959fbe
* commit '
05af959fbe4846ed5df4d74bd838042a8db9a818':
Stop encoding absolute paths in symbols
Chih-hung Hsieh [Tue, 20 Oct 2015 23:58:58 +0000 (23:58 +0000)]
Merge "Move x86 target to clang by default." am:
a993bfff36 am:
ebfadd8990
am:
9b2e93946e
* commit '
9b2e93946e20021f75802805d57e3fa56287ee35':
Move x86 target to clang by default.
Andreas Gampe [Tue, 20 Oct 2015 23:54:53 +0000 (23:54 +0000)]
Merge "Build: Fix DEX2OAT_TARGET_CPU_VARIANT setting" am:
6c45f4493e
am:
3c131856ee
* commit '
3c131856ee9e08c69830675cfc6c3597f783816a':
Build: Fix DEX2OAT_TARGET_CPU_VARIANT setting
Andreas Gampe [Tue, 20 Oct 2015 23:50:59 +0000 (23:50 +0000)]
Merge "Build: Fix DEX2OAT_TARGET_CPU_VARIANT setting"
am:
6c45f4493e
* commit '
6c45f4493e125f4632ee0d0ed95d0198018cbb80':
Build: Fix DEX2OAT_TARGET_CPU_VARIANT setting
Andreas Gampe [Tue, 20 Oct 2015 23:37:36 +0000 (23:37 +0000)]
Merge "Build: Fix DEX2OAT_TARGET_CPU_VARIANT setting"
Colin Cross [Mon, 5 Oct 2015 22:12:08 +0000 (15:12 -0700)]
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
Roland Levillain [Tue, 20 Oct 2015 21:54:03 +0000 (21:54 +0000)]
Merge "Typos in envsetup.sh." am:
8503cfb49c
am:
fef5ba8ec7
* commit '
fef5ba8ec719a9fdd5f8b3d91d61d01a353e1ede':
Typos in envsetup.sh.
Roland Levillain [Tue, 20 Oct 2015 21:44:10 +0000 (21:44 +0000)]
Merge "Typos in envsetup.sh."
am:
8503cfb49c
* commit '
8503cfb49c797bffa2568cffaab483071230fef0':
Typos in envsetup.sh.
Roland Levillain [Tue, 20 Oct 2015 21:30:10 +0000 (21:30 +0000)]
Merge "Typos in envsetup.sh."
Dan Willemsen [Tue, 20 Oct 2015 20:58:31 +0000 (20:58 +0000)]
Merge "Stop encoding absolute paths in symbols" am:
9f576acde6
am:
b93e8250d7
* commit '
b93e8250d7ffbf0760bda670dbcd2ad25b504e90':
Stop encoding absolute paths in symbols
Dan Willemsen [Tue, 20 Oct 2015 20:52:09 +0000 (20:52 +0000)]
Merge "Stop encoding absolute paths in symbols"
am:
9f576acde6
* commit '
9f576acde6c27149c9ca563f0a73e9f1c5e0e768':
Stop encoding absolute paths in symbols
Dan Willemsen [Tue, 20 Oct 2015 20:46:21 +0000 (20:46 +0000)]
Merge "Stop encoding absolute paths in symbols"
Chih-hung Hsieh [Tue, 20 Oct 2015 20:18:30 +0000 (20:18 +0000)]
Merge "Move x86 target to clang by default." am:
a993bfff36
am:
ebfadd8990
* commit '
ebfadd89905f4e703b81c024d9841fdd70595422':
Move x86 target to clang by default.
Christopher Wiley [Tue, 20 Oct 2015 20:14:50 +0000 (20:14 +0000)]
Merge "Invoke the aidl-cpp compiler to generate C++" am:
ba39c5690a am:
487cc7beaf
am:
9c694a6242
* commit '
9c694a6242a969e27fbd4f043fa7f43ef301b461':
Invoke the aidl-cpp compiler to generate C++
Chih-hung Hsieh [Tue, 20 Oct 2015 20:12:12 +0000 (20:12 +0000)]
Merge "Move x86 target to clang by default."
am:
a993bfff36
* commit '
a993bfff361b22902387fc66d734abe385ca3338':
Move x86 target to clang by default.
Chih-hung Hsieh [Tue, 20 Oct 2015 19:47:55 +0000 (19:47 +0000)]
Merge "Move x86 target to clang by default."
Chih-Hung Hsieh [Tue, 20 Oct 2015 19:16:57 +0000 (12:16 -0700)]
Move x86 target to clang by default.
Bug:
23163853
Change-Id: Ib5e9beddbeca8968d6e4365abeb44ae97cbe9981
Roland Levillain [Tue, 20 Oct 2015 11:48:19 +0000 (12:48 +0100)]
Typos in envsetup.sh.
Change-Id: I31cc811e1352b9c924bdf164561f334b032d6f5c
Andreas Gampe [Fri, 16 Oct 2015 03:43:29 +0000 (20:43 -0700)]
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
Christopher Wiley [Mon, 19 Oct 2015 23:56:48 +0000 (23:56 +0000)]
Merge "Invoke the aidl-cpp compiler to generate C++" am:
ba39c5690a
am:
487cc7beaf
* commit '
487cc7beaff3e4fecd92504c1972d6d53079f84e':
Invoke the aidl-cpp compiler to generate C++
Christopher Wiley [Mon, 19 Oct 2015 23:49:58 +0000 (23:49 +0000)]
Merge "Invoke the aidl-cpp compiler to generate C++"
am:
ba39c5690a
* commit '
ba39c5690aae0bcd7102c0030a31b705ce1b92f1':
Invoke the aidl-cpp compiler to generate C++
Christopher Wiley [Mon, 19 Oct 2015 23:44:21 +0000 (23:44 +0000)]
Merge "Invoke the aidl-cpp compiler to generate C++"
Ying Wang [Mon, 19 Oct 2015 23:43:26 +0000 (23:43 +0000)]
Merge "envsetup: Show error when supplied dir isn\'t present with mmm" am:
475054a16a am:
3a6ad87039
am:
4c3d8573a3
* commit '
4c3d8573a3cfb5012396cf009255dd95f1378c40':
envsetup: Show error when supplied dir isn't present with mmm
Dan Willemsen [Mon, 19 Oct 2015 23:43:14 +0000 (23:43 +0000)]
am
3fc56a1f: am
77493047: Merge "Add support for LOCAL_SRC_FILES_EXCLUDE"
am:
fa912eb293
* commit '
fa912eb2935aefba2826109ffbd19fd5556c9668':
Add support for LOCAL_SRC_FILES_EXCLUDE
Ying Wang [Mon, 19 Oct 2015 23:28:27 +0000 (23:28 +0000)]
Merge "envsetup: Show error when supplied dir isn\'t present with mmm" am:
475054a16a
am:
3a6ad87039
* commit '
3a6ad87039910b7fc7bfb078fec8a66d66441d81':
envsetup: Show error when supplied dir isn't present with mmm
Ying Wang [Mon, 19 Oct 2015 23:21:46 +0000 (23:21 +0000)]
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
Christopher Wiley [Thu, 15 Oct 2015 00:27:24 +0000 (17:27 -0700)]
Invoke the aidl-cpp compiler to generate C++
Bug:
23599697
Test: test application compiles generated code
Change-Id: I35255517dd0b7ef7a82134be1c862093eaa3ce6b
Ying Wang [Mon, 19 Oct 2015 22:44:03 +0000 (22:44 +0000)]
Merge "envsetup: Show error when supplied dir isn't present with mmm"
Dan Willemsen [Mon, 19 Oct 2015 21:30:20 +0000 (21:30 +0000)]
am
3fc56a1f: am
77493047: Merge "Add support for LOCAL_SRC_FILES_EXCLUDE"
* commit '
3fc56a1fa18399f9dfaa2d9a7ae2c7aee852d574':
Add support for LOCAL_SRC_FILES_EXCLUDE
Dan Willemsen [Mon, 19 Oct 2015 21:24:53 +0000 (14:24 -0700)]
am
77493047: Merge "Add support for LOCAL_SRC_FILES_EXCLUDE"
* commit '
7749304741070af8239e02f68d688fc45fd877d1':
Add support for LOCAL_SRC_FILES_EXCLUDE
Dan Willemsen [Mon, 19 Oct 2015 21:21:40 +0000 (21:21 +0000)]
Merge "Add support for LOCAL_SRC_FILES_EXCLUDE"
Abhinav1997 [Sun, 18 Oct 2015 18:25:48 +0000 (20:25 +0200)]
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>
Sami Tolvanen [Mon, 19 Oct 2015 10:07:21 +0000 (10:07 +0000)]
am
6a14ba31: am
58a748d3: am
87f58261: Merge "Error correction: Append codes to verified partitions"
* commit '
6a14ba317cea22f16db3bb76cb818fd7322b8253':
Error correction: Append codes to verified partitions
Sami Tolvanen [Mon, 19 Oct 2015 09:59:12 +0000 (09:59 +0000)]
am
58a748d3: am
87f58261: Merge "Error correction: Append codes to verified partitions"
* commit '
58a748d37e0a6f9ec063b374d4f60354def26579':
Error correction: Append codes to verified partitions
Sami Tolvanen [Mon, 19 Oct 2015 09:55:51 +0000 (02:55 -0700)]
am
87f58261: Merge "Error correction: Append codes to verified partitions"
* commit '
87f582611a5a5c23abf3237abe0e467e46111567':
Error correction: Append codes to verified partitions
Sami Tolvanen [Mon, 19 Oct 2015 09:49:18 +0000 (09:49 +0000)]
Merge "Error correction: Append codes to verified partitions"
Ying Wang [Sun, 18 Oct 2015 17:22:15 +0000 (17:22 +0000)]
am
6129c60a: am
cd9545a4: am
4f6f0f92: Merge "If a console doesn\'t exist, read password from stdin."
* commit '
6129c60a35fcc81b6336f584191b6e44edd55a51':
If a console doesn't exist, read password from stdin.
Ying Wang [Sun, 18 Oct 2015 17:17:28 +0000 (17:17 +0000)]
am
cd9545a4: am
4f6f0f92: Merge "If a console doesn\'t exist, read password from stdin."
* commit '
cd9545a499a1124a52e4edf962c53b83f23ebae8':
If a console doesn't exist, read password from stdin.
Ying Wang [Sun, 18 Oct 2015 17:12:27 +0000 (10:12 -0700)]
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.
Ying Wang [Sun, 18 Oct 2015 17:07:28 +0000 (17:07 +0000)]
Merge "If a console doesn't exist, read password from stdin."
Tao Bao [Sat, 17 Oct 2015 01:35:54 +0000 (01:35 +0000)]
am
5fd65d8d: (-s ours) am
512d7b87: am
1280fa01: am
09ee6daa: am
bc5e85af: Merge "DO NOT MERGE releasetools: Always write the last block if it\'s padded." into mnc-dev
* commit '
5fd65d8dc542d4aaa6d205781443ea61b5519f41':
DO NOT MERGE releasetools: Always write the last block if it's padded.
Tao Bao [Sat, 17 Oct 2015 01:31:49 +0000 (01:31 +0000)]
am
512d7b87: am
1280fa01: am
09ee6daa: am
bc5e85af: Merge "DO NOT MERGE releasetools: Always write the last block if it\'s padded." into mnc-dev
* commit '
512d7b87dc04551633d603e1dd97e95d0dcc3565':
DO NOT MERGE releasetools: Always write the last block if it's padded.
Tao Bao [Sat, 17 Oct 2015 01:27:16 +0000 (01:27 +0000)]
am
1280fa01: am
09ee6daa: am
bc5e85af: Merge "DO NOT MERGE releasetools: Always write the last block if it\'s padded." into mnc-dev
* commit '
1280fa01bd263eac1d31850fe47f8e0aa93cab82':
DO NOT MERGE releasetools: Always write the last block if it's padded.
Tao Bao [Sat, 17 Oct 2015 01:23:02 +0000 (01:23 +0000)]
am
09ee6daa: am
bc5e85af: Merge "DO NOT MERGE releasetools: Always write the last block if it\'s padded." into mnc-dev
* commit '
09ee6daa7f4d9a526532e77b45aa88bbf1f0776d':
DO NOT MERGE releasetools: Always write the last block if it's padded.
Tao Bao [Sat, 17 Oct 2015 01:19:15 +0000 (01:19 +0000)]
am
bc5e85af: Merge "DO NOT MERGE releasetools: Always write the last block if it\'s padded." into mnc-dev
* commit '
bc5e85afc9cbbbb3c7e7364a6ff2a29cfb596d38':
DO NOT MERGE releasetools: Always write the last block if it's padded.
Tao Bao [Sat, 17 Oct 2015 01:15:39 +0000 (01:15 +0000)]
Merge "DO NOT MERGE releasetools: Always write the last block if it's padded." into mnc-dev
Colin Cross [Tue, 30 Jun 2015 19:21:59 +0000 (12:21 -0700)]
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
Tao Bao [Sat, 17 Oct 2015 00:26:53 +0000 (00:26 +0000)]
am
15e44d38: (-s ours) am
9cc6c37a: am
5631d5c6: am
46ae586a: am
e09359ab: DO NOT MERGE Pass source\'s info_dict to vendor\'s releasetools.py.
* commit '
15e44d385739d22719d295ec7f55883180b8fabf':
DO NOT MERGE Pass source's info_dict to vendor's releasetools.py.
Tao Bao [Sat, 17 Oct 2015 00:21:47 +0000 (00:21 +0000)]
am
9cc6c37a: am
5631d5c6: am
46ae586a: am
e09359ab: DO NOT MERGE Pass source\'s info_dict to vendor\'s releasetools.py.
* commit '
9cc6c37a54626a4d23599fa8d86ffe0bcabec55a':
DO NOT MERGE Pass source's info_dict to vendor's releasetools.py.
Tao Bao [Sat, 17 Oct 2015 00:18:27 +0000 (00:18 +0000)]
am
5631d5c6: am
46ae586a: am
e09359ab: DO NOT MERGE Pass source\'s info_dict to vendor\'s releasetools.py.
* commit '
5631d5c6e12937fd50ef576c6cff1c7ed7c5ae1b':
DO NOT MERGE Pass source's info_dict to vendor's releasetools.py.
Tao Bao [Sat, 17 Oct 2015 00:13:36 +0000 (00:13 +0000)]
am
46ae586a: am
e09359ab: DO NOT MERGE Pass source\'s info_dict to vendor\'s releasetools.py.
* commit '
46ae586ab26f5bf63baaac6c68942f1bfba4addc':
DO NOT MERGE Pass source's info_dict to vendor's releasetools.py.
Tao Bao [Sat, 17 Oct 2015 00:09:35 +0000 (00:09 +0000)]
am
e09359ab: DO NOT MERGE Pass source\'s info_dict to vendor\'s releasetools.py.
* commit '
e09359abc0f8c29fbb16d35ab7375d80fde6f931':
DO NOT MERGE Pass source's info_dict to vendor's releasetools.py.
Tao Bao [Fri, 16 Oct 2015 23:33:09 +0000 (23:33 +0000)]
am
88aea006: am
6ce8ae76: am
ac39bef4: Merge "common.py: Fix the build."
* commit '
88aea00628cb3d90f6674f7762a8ed9f793d06cb':
common.py: Fix the build.
Tao Bao [Fri, 16 Oct 2015 22:26:34 +0000 (15:26 -0700)]
common.py: Fix the build.
Should only use source_info_dict when creating incremental OTAs.
Change-Id: I3305632aab3334f5e6a555cde7ef0c311965c4b8
(cherry picked from commit
aac4ad56b6c60e271d807604b20f72084c58b426)
Tao Bao [Fri, 16 Oct 2015 22:50:39 +0000 (22:50 +0000)]
am
6ce8ae76: am
ac39bef4: Merge "common.py: Fix the build."
* commit '
6ce8ae761b8a238ce215638510230baed277235f':
common.py: Fix the build.
Tao Bao [Tue, 13 Oct 2015 23:37:12 +0000 (16:37 -0700)]
DO NOT MERGE Pass source's info_dict to vendor's releasetools.py.
When building incremental packages, the info_dict from the source build
should be the one in use. We have done that for most of the partitions
(system and etc.), and should pass that to vendor's script as well.
Also includes the CL in commit
aac4ad56b6c60e271d807604b20f72084c58b426
that fixes a bug in commit
6f0b219ac551710c724e3f344023943178cdc217.
Bug:
24898607
Change-Id: I4ea6037dad7061e1683661fc4c394fa3a7a7c5cd
(cherry picked from commit
6f0b219ac551710c724e3f344023943178cdc217)
Tao Bao [Fri, 16 Oct 2015 22:46:31 +0000 (15:46 -0700)]
am
ac39bef4: Merge "common.py: Fix the build."
* commit '
ac39bef43fb032bff75b8558f54107e733355265':
common.py: Fix the build.
Tao Bao [Fri, 16 Oct 2015 22:41:45 +0000 (22:41 +0000)]
Merge "common.py: Fix the build."
Tao Bao [Fri, 16 Oct 2015 22:26:34 +0000 (15:26 -0700)]
common.py: Fix the build.
Should only use source_info_dict when creating incremental OTAs.
Change-Id: I6a4e5f8fa3613a1b36563ec915e433247965a2b8
Tao Bao [Fri, 16 Oct 2015 22:04:27 +0000 (22:04 +0000)]
am
db078f51: am
63e63c2a: am
543b28d4: Merge "Pass source\'s info_dict to vendor\'s releasetools.py."
* commit '
db078f5166ca0cdfbf39f3bb9a983a2207d7a7e1':
Pass source's info_dict to vendor's releasetools.py.
Tao Bao [Fri, 16 Oct 2015 21:55:46 +0000 (21:55 +0000)]
am
63e63c2a: am
543b28d4: Merge "Pass source\'s info_dict to vendor\'s releasetools.py."
* commit '
63e63c2a0754e726d6f810588a0314a79268f404':
Pass source's info_dict to vendor's releasetools.py.
Tao Bao [Fri, 16 Oct 2015 21:49:40 +0000 (14:49 -0700)]
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.
Tao Bao [Sun, 6 Sep 2015 03:35:32 +0000 (20:35 -0700)]
DO NOT MERGE releasetools: Always write the last block if it's padded.
In BBOTAs if the last block of a DataImage is padded, we should always
write the whole block even for incremental OTAs. Because otherwise the
last block may be skipped if unchanged, but would fail the post-install
verification if it has non-zero contents in the padding bytes.
Bug:
24981812
Change-Id: Id0608384fcff0375aec8c158e6f909569b873d31
(cherry picked from commit
7589e961a7b8b7d964704db87f83ed8811e97ac6)
Tao Bao [Fri, 16 Oct 2015 21:42:34 +0000 (21:42 +0000)]
Merge "Pass source's info_dict to vendor's releasetools.py."
Ying Wang [Fri, 16 Oct 2015 12:08:04 +0000 (12:08 +0000)]
am
08785f11: am
19fcc054: am
19e4741d: Merge "Use direct dependency on the JNI so files."
* commit '
08785f116b2f947e8d5a12ae4d1612d82f860d91':
Use direct dependency on the JNI so files.
Ying Wang [Fri, 16 Oct 2015 01:29:58 +0000 (01:29 +0000)]
am
19fcc054: am
19e4741d: Merge "Use direct dependency on the JNI so files."
* commit '
19fcc054bd489799408691bbb933ff2d6cea7a4a':
Use direct dependency on the JNI so files.