Commit Graph

8267 Commits

Author SHA1 Message Date
Tao Bao
ada3927e53 Merge "Bump up the BBOTA version to 4."
am: ac4ec1a4ea

* commit 'ac4ec1a4ea83a150e08ccd43f30fe34de52cdebf':
  Bump up the BBOTA version to 4.
2015-10-23 18:45:35 +00:00
Tao Bao
ac4ec1a4ea Merge "Bump up the BBOTA version to 4." 2015-10-23 18:38:03 +00:00
Ying Wang
3d7584d9c3 Merge "Make sure R.stamp is always created"
am: 47e46f7725

* commit '47e46f77257e172c3603208587cce55c0a9fc28f':
  Make sure R.stamp is always created
2015-10-23 18:16:45 +00:00
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
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
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
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
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
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
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
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
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
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
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
Ying Wang
d358f826e7 Use direct dependency on the JNI so files.
With the order-only dependency if the jni so files is updated,
make won't rebuild the system.img, which has dependency only on the apk
file.

Bug: 24865400
Change-Id: I9d5bee82b8a712a2c24dabaa0cd4c50174ea219f
2015-10-15 17:50:06 -07:00
Dan Albert
b56b2e9aa0 am 5baea143: Merge "Use libgcov OR libclang_rt.profile, not both."
* commit '5baea1436371dea7e14562b17431bcd2b6a55f7d':
  Use libgcov OR libclang_rt.profile, not both.
2015-10-15 18:48:42 +00:00
Dan Albert
5baea14363 Merge "Use libgcov OR libclang_rt.profile, not both." 2015-10-15 18:39:42 +00:00
Steve Fung
a6968d8f1d am 2af58637: Merge "Add the Product ID to target_files.zip"
* commit '2af586376d2b99c75a5672c72a704f2031adc0fe':
  Add the Product ID to target_files.zip
2015-10-15 18:19:52 +00:00
Steve Fung
2af586376d Merge "Add the Product ID to target_files.zip" 2015-10-15 18:13:41 +00:00
Peter Qiu
cf58d1f5fe am 7d3690eb: Merge "Export include path to D-Bus headers for multilib builds"
* commit '7d3690eb3572477b65c04c7a7964a3367c2f69a6':
  Export include path to D-Bus headers for multilib builds
2015-10-15 04:08:50 +00:00
Peter Qiu
7d3690eb35 Merge "Export include path to D-Bus headers for multilib builds" 2015-10-15 04:00:38 +00:00
Ying Wang
ef67c1963f am 84c5ae52: Merge "Use @arg-lsit-file for jar in add-carried-jack-resources"
* commit '84c5ae523201f17b94b5b0afe85a9af3f26c8231':
  Use @arg-lsit-file for jar in add-carried-jack-resources
2015-10-15 01:15:34 +00:00
Ying Wang
3a562a9942 Use @arg-lsit-file for jar in add-carried-jack-resources
Don't pass the arg list as argument in any bash command;
Instead store the arg list to the arg list file and
run "jar @arg-lsit-file".
Note we need to quote the arguments in the arg list file.

This fixed "argument list too long" build error on Mac.

Bug: 24789595
Change-Id: I718f84e540d82bb83516824894a473b2961da278
2015-10-14 17:48:21 -07:00
Dan Willemsen
6a66a887ba Stop encoding absolute paths in symbols
GCC & Clang encode the current working directory into the symbol files.
Even if the binaries are stripped before being installed, the build-id
hash will be different. This means that two different checkouts will
produce different installed binaries, even if the sources are identical.

To prevent this, set PWD=/proc/self/cwd, so that it replaces the
absolute path with the static path /proc/self/cwd. With GCC, use
-fdebug-prefix-map to remove that static path. Our clang does not yet
support this flag, but it was merged in r250094.

This does change the behavior when using gdb -- you now need to be in
$ANDROID_BUILD_TOP before gdb will load the sources.

Bug: 24204119
Change-Id: I792d65b042b7a3fdc78d567c5a6e93cdf0141b9b
2015-10-14 17:30:11 -07:00
Peter Qiu
425e01996a Export include path to D-Bus headers for multilib builds
Bug:None

Change-Id: I6e3898c71f54ede08a27f5be93e95a2b219e5ea6
2015-10-14 16:54:48 -07:00
Ying Wang
5b7aaeaa2e am ed4b0eeb: Merge "Revert "Use @arg-lsit-file for jar in add-carried-jack-resources""
* commit 'ed4b0eeb435903d9be502dcebd2c000f143df575':
  Revert "Use @arg-lsit-file for jar in add-carried-jack-resources"
2015-10-14 23:32:18 +00:00
Ying Wang
ed4b0eeb43 Merge "Revert "Use @arg-lsit-file for jar in add-carried-jack-resources"" 2015-10-14 23:09:14 +00:00
Ying Wang
3bfecc8b65 Revert "Use @arg-lsit-file for jar in add-carried-jack-resources"
This reverts commit 16f93d5661.

Change-Id: I925dae6a2d07792c61fcd3b6fd8718391ab993f8
2015-10-14 23:08:53 +00:00
Steve Fung
22d624a904 Add the Product ID to target_files.zip
When using the A/B updater, include the product id string to
target_files.zip.
This is needed by the Omaha backend.

Bug: 24946811
Change-Id: I2ce5f6cffe440c29a1820348ee215c71cec07861
2015-10-14 15:56:50 -07:00
Ying Wang
5d012538fb am 37572684: Merge "Use @arg-lsit-file for jar in add-carried-jack-resources"
* commit '3757268466d8fe9438e45e989728a74f14a162c6':
  Use @arg-lsit-file for jar in add-carried-jack-resources
2015-10-14 21:47:50 +00:00