Commit Graph

8680 Commits

Author SHA1 Message Date
Ying Wang
47e46f7725 Merge "Make sure R.stamp is always created" 2015-10-23 18:09:11 +00:00
Martin Arenlind
fb6985e4dc Make sure R.stamp is always created
When an app has a resource directory, but the
directory contain no resources, R.stamp is not created.

This leads to that such apps are always rebuilt,
even when there are no changes.

This patch changes so that an empty R.stamp is
created even if there are no resources.
This leads to that affected apps are not rebuilt
unless changed.

Change-Id: Ia63e5b1913a4456402700b615ba7f9d56d2da852
2015-10-23 11:07:28 -07:00
Tao Bao
eba409c4da Bump up the BBOTA version to 4.
To accommodate new changes (such as error correction in [1]) to BBOTA
in N release. We bump up the version to keep the OTA script backward
compatible.

Needs the matching CL in commit
1fdec8685af858c5ff4f45d2e3059186ab5ed2ab.

[1]: commit 0a7b47397db3648afe6f3aeb2abb175934c2cbca

Change-Id: Ib9158b455cd5905fe2d4742ce81feb1b7583054f
2015-10-23 10:45:36 -07:00
Alex Deymo
7489b59905 Merge "Rename UPDATE_AB_PARTITIONS to AB_OTA_PARTITIONS." am: c82b873b9b am: 7410ed86c6
am: 47d31960d5

* commit '47d31960d5ea013e049ed3548c7dd5445caae6a6':
  Rename UPDATE_AB_PARTITIONS to AB_OTA_PARTITIONS.
2015-10-23 14:54:49 +00:00
Alex Deymo
47d31960d5 Merge "Rename UPDATE_AB_PARTITIONS to AB_OTA_PARTITIONS." am: c82b873b9b
am: 7410ed86c6

* commit '7410ed86c6ffa165ee7cc4b142e9843c18ae61a6':
  Rename UPDATE_AB_PARTITIONS to AB_OTA_PARTITIONS.
2015-10-23 14:51:34 +00:00
Alex Deymo
7410ed86c6 Merge "Rename UPDATE_AB_PARTITIONS to AB_OTA_PARTITIONS."
am: c82b873b9b

* commit 'c82b873b9b6c234da128cdbc0dde6624e45f5b6d':
  Rename UPDATE_AB_PARTITIONS to AB_OTA_PARTITIONS.
2015-10-23 14:48:30 +00:00
Alex Deymo
49be2b115c Rename UPDATE_AB_PARTITIONS to AB_OTA_PARTITIONS.
In order to have all the A/B updater variables in the same AB_OTA_
namespace we rename UPDATE_AB_PARTITIONS to AB_OTA_PARTITIONS.

Bug: None
Test: `make dist` includes the partitions.txt file if properly configured.

Change-Id: Ied4faabd7e2f0ab8a5007afb44ad2f38df8d630d
2015-10-22 18:17:36 -07:00
Ying Wang
2af4d1ad2c Normalize java source file paths before running "sort -u".
We rely on "sort -u" to dedupe aidl/logtags generated java files added
by both from $(all_java_sources) and from "find
$(PRIVATE_SOURCE_INTERMEDIATES_DIR) -name '*.java".
But "sort -u" doesn't work if any of the aidl/logtags source file path
has "../" in it.
This change fixes this issue by normalizing the source file paths before
passing them to "sort -u".

Change-Id: I12d2c4e0397bed9f426a1ed9b13608d72d01e0df
2015-10-22 16:35:10 -07:00
Zach Jang
632d0e4ef2 Update security string to 2015-12-01 am: 0f1512bc03 am: 7b4c7fe5b7 am: 5e994e0d9c
am: dca5dd4f79

* commit 'dca5dd4f795d6f47591370c1ad27d45b2432b208':
  Update security string to 2015-12-01
2015-10-22 22:09:16 +00:00
Ian Pedowitz
36bf4976bb Bump Android to 6.0.1 am: 0a20c942c4 am: 1f9ba9f89e
am: 4919ed4afc

* commit '4919ed4afc0c289683bfb4932640f6f9b52ed9c7':
  Bump Android to 6.0.1
2015-10-22 22:04:15 +00:00
Zach Jang
dca5dd4f79 Update security string to 2015-12-01 am: 0f1512bc03 am: 7b4c7fe5b7
am: 5e994e0d9c

* commit '5e994e0d9cb29bbb5e57bb4389086a6e106f6acd':
  Update security string to 2015-12-01
2015-10-22 22:04:07 +00:00
Ian Pedowitz
0a20c942c4 Bump Android to 6.0.1
Bug: 24777474
Change-Id: Ibaca3c2d583aa92c8ca998b6d380ee720b71b1b8
2015-10-22 21:46:00 +00:00
Than McIntosh
127d110172 Enable gold linker for aarch64.
Switches default linker from -fuse-ld-bfd to
-fuse-ld=gold, and enables -Wl,--icf=safe. This
changes reduces /system/lib64/*.so text size
by about 2% for N9.

Change-Id: I0ef2483e1c47c34e63292dad6f6bf532359b733e
2015-10-22 09:44:48 -04:00
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
Ying Wang
9d8a062da0 Fix cts split apk testcase copy pattern rule.
Bug: 21762834
Change-Id: Ib8ff956685c898132a11de45a0d7cfdd1009f48c
2015-10-21 14:15:52 -07:00
Ying Wang
50ac854af2 Merge "Add LOCAL_FINDBUGS_FLAGS to support custom findbugs flags." 2015-10-21 17:49:39 +00:00
Ying Wang
035288eded Merge "Set up CTS copy rules only once for multilib build." 2015-10-21 17:49:23 +00:00
Ying Wang
702e01e258 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
2015-10-21 10:30:51 -07:00
Stephen Hines
6433b6c795 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)."
2015-10-21 16:52:42 +00: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
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
Ying Wang
719f198d5a Set up CTS copy rules only once for multilib build.
Bug: 21762834
Change-Id: I488893b2fd26c9aaeb92ae494bc46e86dad1622d
2015-10-20 18:18:40 -07:00
Stephen Hines
017cefee5b 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).
2015-10-21 00:34:27 +00:00
Colin Cross
b66ccce7e5 Merge changes I2ba90314,I5f47307d am: fc8b331858 am: 8b63d67e1b
am: 5538dc8bfe

* commit '5538dc8bfec3d92be8c982d439488ba44431890f':
  makeparallel: prepend flags to ninja command line
  Put NINJA_ARGS last
2015-10-21 00:34:21 +00: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
Andreas Gampe
36047501aa Merge "Build: Fix DEX2OAT_TARGET_CPU_VARIANT setting" am: 6c45f4493e am: 3c131856ee
am: 92a73a0f6c

* commit '92a73a0f6c0c768d4bc612106e0c6ddcb7fb2846':
  Build: Fix DEX2OAT_TARGET_CPU_VARIANT setting
2015-10-20 23:59:45 +00:00
Dan Willemsen
7be79bfa64 Merge "Stop encoding absolute paths in symbols" am: 9f576acde6 am: b93e8250d7
am: 05af959fbe

* commit '05af959fbe4846ed5df4d74bd838042a8db9a818':
  Stop encoding absolute paths in symbols
2015-10-20 23:59:05 +00: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
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
Christopher Wiley
597f384fb3 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++
2015-10-20 20:14:50 +00: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
Zach Jang
0f1512bc03 Update security string to 2015-12-01
Change-Id: I525bab4579449dd285ba87d7ddc9cb36223bf7fd
2015-10-19 17:57:33 -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
Dan Willemsen
112a39da7d am 3fc56a1f: am 77493047: Merge "Add support for LOCAL_SRC_FILES_EXCLUDE"
am: fa912eb293

* commit 'fa912eb2935aefba2826109ffbd19fd5556c9668':
  Add support for LOCAL_SRC_FILES_EXCLUDE
2015-10-19 23:43:14 +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
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
Sami Tolvanen
a749f91191 am 6a14ba31: am 58a748d3: am 87f58261: Merge "Error correction: Append codes to verified partitions"
* commit '6a14ba317cea22f16db3bb76cb818fd7322b8253':
  Error correction: Append codes to verified partitions
2015-10-19 10:07:21 +00: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