Commit Graph

9793 Commits

Author SHA1 Message Date
Josh Gao
1ae548d81d Merge "Error out if MALLOC_IMPL is defined." 2016-01-25 18:23:35 +00:00
Neil Fuller
fcf7c81a7f Revert "Revert "Make OpenJDK 8 the default""
Reapply the JDK 8 switch in internal builds.

This reverts commit 85bddfdedf.
2016-01-25 17:35:57 +00:00
Alex Klyubin
4f90999d7a Merge "Revert "Sign APKs using SHA-256 instead of SHA-1 when possible."" am: 7382bdf8c1
am: 2cf2509542

* commit '2cf2509542d234e4d958195c834b74da2253b2cb':
  Revert "Sign APKs using SHA-256 instead of SHA-1 when possible."
2016-01-25 17:26:54 +00:00
Alex Klyubin
2cf2509542 Merge "Revert "Sign APKs using SHA-256 instead of SHA-1 when possible.""
am: 7382bdf8c1

* commit '7382bdf8c1a755fe20c5979453bfeec0be73da27':
  Revert "Sign APKs using SHA-256 instead of SHA-1 when possible."
2016-01-25 17:24:27 +00:00
Alex Klyubin
7382bdf8c1 Merge "Revert "Sign APKs using SHA-256 instead of SHA-1 when possible."" 2016-01-25 17:19:02 +00:00
Alex Klyubin
1429d5e14c Revert "Sign APKs using SHA-256 instead of SHA-1 when possible."
This reverts commit de5bc04717 because it's breaking some builds. Turns out some APKs have multiple sdkVersion attributes returned by aapt.

Change-Id: I013d6ef5eac473dd3900e0b9edf4c32cdc838bab
2016-01-25 17:17:09 +00:00
Neil Fuller
3ec8eeb90b Merge "Revert "Make OpenJDK 8 the default"" am: c0acea2571
am: a5e4ea2e44

* commit 'a5e4ea2e44e324101b412bac9f2fbb97bdc91670':
  Revert "Make OpenJDK 8 the default"
2016-01-25 17:17:04 +00:00
Neil Fuller
a5e4ea2e44 Merge "Revert "Make OpenJDK 8 the default""
am: c0acea2571

* commit 'c0acea25717fb26a13572d459b02811d8c8f9db6':
  Revert "Make OpenJDK 8 the default"
2016-01-25 17:14:16 +00:00
Neil Fuller
1f495b865e Revert "Revert "Make OpenJDK 8 the default""
Reapply the switch to JDK 8 on aosp/master.

This reverts commit 85bddfdedf.

Change-Id: If2e8733ba78b007d37914c0512cd6be1bd4c1e69
2016-01-25 17:12:41 +00:00
Neil Fuller
c0acea2571 Merge "Revert "Make OpenJDK 8 the default"" 2016-01-25 17:11:12 +00:00
Neil Fuller
85bddfdedf Revert "Make OpenJDK 8 the default"
Temporary revert to help out Brillo folks.
It will be resubmitted tomorrow.

This reverts commit 4495f6afb8.

Change-Id: Id378c7d3a6e72e9be50f9404b19d5763568987a5
2016-01-25 17:04:14 +00:00
Alex Klyubin
6e850d0193 Merge "Sign APKs using SHA-256 instead of SHA-1 when possible." am: b763b29267
am: 2a37afd32c

* commit '2a37afd32c4bb571ced26ec738a9d9a89b5fba7e':
  Sign APKs using SHA-256 instead of SHA-1 when possible.
2016-01-25 16:48:46 +00:00
Alex Klyubin
2a37afd32c Merge "Sign APKs using SHA-256 instead of SHA-1 when possible."
am: b763b29267

* commit 'b763b292671b9b18dcc9a5961c173667c674a3d5':
  Sign APKs using SHA-256 instead of SHA-1 when possible.
2016-01-25 16:46:43 +00:00
Alex Klyubin
b763b29267 Merge "Sign APKs using SHA-256 instead of SHA-1 when possible." 2016-01-25 16:42:27 +00:00
Neil Fuller
eaf7dbc90a Merge "Make OpenJDK 8 the default"
am: 797d3deb52

* commit '797d3deb52980a2bd8759e68a78ea99a56bb51e2':
  Make OpenJDK 8 the default
2016-01-25 10:53:01 +00:00
Neil Fuller
4495f6afb8 Make OpenJDK 8 the default
To return to OpenJDK 7:
export LEGACY_USE_JAVA7=true

And run envsetup.sh/lunch again.

Bug: 25786468
Change-Id: I8e00591a24d13e3b8b6baaafe0fdff6536c58770
2016-01-25 10:19:25 +00:00
Stephen Hines
64fe4cb61a Merge "Add an RS_CLANG variable as well for RenderScript." am: adad19674c
am: d809c6ed48

* commit 'd809c6ed48835a02c32c2be3a8867f7bee04328b':
  Add an RS_CLANG variable as well for RenderScript.
2016-01-23 01:04:12 +00:00
Stephen Hines
d809c6ed48 Merge "Add an RS_CLANG variable as well for RenderScript."
am: adad19674c

* commit 'adad19674cfd7c38b16f2c2bd0c5bdf956157c6c':
  Add an RS_CLANG variable as well for RenderScript.
2016-01-22 23:28:16 +00:00
Stephen Hines
49b695375c Add an RS_CLANG variable as well for RenderScript.
Change-Id: I33a73c4c2b19aa17bc18a64c92a86565111de3d0
2016-01-22 15:11:58 -08:00
Stephen Hines
b7a9e8ed90 Merge "Add clang rules for RS_LLVM_* tools." am: 4ac28d5258
am: 48f0b9fb5a

* commit '48f0b9fb5a7083b41bb4804059fac194f8b8c1e1':
  Add clang rules for RS_LLVM_* tools.
2016-01-22 21:50:31 +00:00
Stephen Hines
48f0b9fb5a Merge "Add clang rules for RS_LLVM_* tools."
am: 4ac28d5258

* commit '4ac28d5258651c214a8480ad082254fd9c94ed55':
  Add clang rules for RS_LLVM_* tools.
2016-01-22 21:24:40 +00:00
Josh Gao
f3e7204bef Error out if MALLOC_IMPL is defined.
Bug: http://b/26390299
Change-Id: Icd3ce6853c8207b1a9ce1f9d546a61d5b113f15a
2016-01-22 11:25:24 -08:00
Stephen Hines
96d2a8c5e4 Add clang rules for RS_LLVM_* tools.
This change adds new variables for RS_LLVM_* tools, which correspond
to the version of LLVM checked in currently to external/, instead of
mapping to the latest host prebuilts. This will help prevent version
differences for newer IR generated by the updated host prebuilts, which
then might not be readable with the on-device LLVM bits we build from
external/.

Change-Id: I6c7b0fa9082e9c8244cc508cb23960569a057740
2016-01-21 23:50:53 -08:00
Colin Cross
1398f9d30d Merge "Set flag when using sdk tools in place" am: 41ee5fc07a
am: 11a87113ef

* commit '11a87113ef232c4f615a4c8df74dc28da17bec1e':
  Set flag when using sdk tools in place
2016-01-22 00:16:17 +00:00
Colin Cross
11a87113ef Merge "Set flag when using sdk tools in place"
am: 41ee5fc07a

* commit '41ee5fc07adf81348a807c2de8d4460598a38fa4':
  Set flag when using sdk tools in place
2016-01-22 00:04:05 +00:00
Colin Cross
41ee5fc07a Merge "Set flag when using sdk tools in place" 2016-01-21 23:36:26 +00:00
Tao Bao
b6459cc143 Merge "Makefile: Fix the location for payload signing key." am: 27a1201989
am: 3ea04365dc

* commit '3ea04365dc39c14d458d69eb3954cbf099654681':
  Makefile: Fix the location for payload signing key.
2016-01-21 23:25:48 +00:00
Dan Willemsen
37693fc24b Merge "Pass the arm/thumb cflags to assembly files" am: 60c9200c1e
am: 537e093fe8

* commit '537e093fe893e21ecab7aba2a32c99f18f5350b6':
  Pass the arm/thumb cflags to assembly files
2016-01-21 23:25:34 +00:00
Tao Bao
c2a8b0b6b1 Merge "Makefile: Add the payload public key into system image." am: b49d05e72e
am: cf7eb025f8

* commit 'cf7eb025f88349797032b649fd47e8b4de80235e':
  Makefile: Add the payload public key into system image.
2016-01-21 23:25:19 +00:00
Tao Bao
3ea04365dc Merge "Makefile: Fix the location for payload signing key."
am: 27a1201989

* commit '27a1201989d782af30a30186a05448dbbe3304b8':
  Makefile: Fix the location for payload signing key.
2016-01-21 23:19:16 +00:00
Dan Willemsen
537e093fe8 Merge "Pass the arm/thumb cflags to assembly files"
am: 60c9200c1e

* commit '60c9200c1ee3f5d983c5f9d9cc1724f6010daca2':
  Pass the arm/thumb cflags to assembly files
2016-01-21 23:19:02 +00:00
Tao Bao
cf7eb025f8 Merge "Makefile: Add the payload public key into system image."
am: b49d05e72e

* commit 'b49d05e72e03c4d51c81ec8fcedd463ea5b0e28f':
  Makefile: Add the payload public key into system image.
2016-01-21 23:18:50 +00:00
Tao Bao
27a1201989 Merge "Makefile: Fix the location for payload signing key." 2016-01-21 22:37:46 +00:00
Tao Bao
23c3db9372 Makefile: Fix the location for payload signing key.
CL in [1] put it in a wrong path.

[1] commit 38812d684b

Bug: 25715402
Change-Id: I01a105888844011eee083d5f4d694223599fa067
2016-01-21 14:33:22 -08:00
Dan Willemsen
60c9200c1e Merge "Pass the arm/thumb cflags to assembly files" 2016-01-21 22:31:11 +00:00
Tao Bao
b49d05e72e Merge "Makefile: Add the payload public key into system image." 2016-01-21 22:21:31 +00:00
Christopher Wiley
e46193a608 Merge "Separate aidl dependencies from compiler dependencies" am: 8edda3afdf
am: cfd817d058

* commit 'cfd817d058994ebda3b98db4e8113752753d422e':
  Separate aidl dependencies from compiler dependencies
2016-01-21 18:29:25 +00:00
Christopher Wiley
d1eea90a72 Merge "Keep aidl generated C++ inside the generated folder" am: 11feb8b075
am: 7c52b2d878

* commit '7c52b2d878e6234cb6e36942c87c438fa1e80240':
  Keep aidl generated C++ inside the generated folder
2016-01-21 18:29:15 +00:00
Christopher Wiley
cfd817d058 Merge "Separate aidl dependencies from compiler dependencies"
am: 8edda3afdf

* commit '8edda3afdf1bf3327706d89a5b4b5ce53feedbe5':
  Separate aidl dependencies from compiler dependencies
2016-01-21 18:27:02 +00:00
Christopher Wiley
7c52b2d878 Merge "Keep aidl generated C++ inside the generated folder"
am: 11feb8b075

* commit '11feb8b075ce48fc4b6386049a666a5e888247f8':
  Keep aidl generated C++ inside the generated folder
2016-01-21 18:26:54 +00:00
Alex Klyubin
de5bc04717 Sign APKs using SHA-256 instead of SHA-1 when possible.
This changes the build system to provide the signapk tool with the
minSdkVersion of the APK being signed. signapk in turn will then use
SHA-256 instead of SHA-1 if minSdkVersion is 18 (JB MR2) or higher
(see c2c49ed0c1).

To avoid increasing incremental OTA update package sizes for already
released platforms, release build scripts disable the above logic when
signing target files ZIPs for pre-N platforms.

Bug: 25643280
Change-Id: I048393e0971d0d6559dbd69ea902754c6c7cab14
2016-01-21 10:25:12 -08:00
Christopher Wiley
8edda3afdf Merge "Separate aidl dependencies from compiler dependencies" 2016-01-21 18:19:05 +00:00
Christopher Wiley
11feb8b075 Merge "Keep aidl generated C++ inside the generated folder" 2016-01-21 18:17:29 +00:00
Narayan Kamath
9a39d29241 Merge "Make a confusing error message clearer." 2016-01-21 10:15:40 +00:00
Tao Bao
38812d684b Makefile: Add the payload public key into system image.
For non-Brillo devices using AB update, add the payload signing public
key to the system image
(system/etc/update_engine/update-payload-key.pub.pem).

We first need to sign the payload with some private key, and pack it
into an Android OTA package. Then the whole zip package will be signed
again with the device key. This is to comply with the two existing OTA
flows (Android and CrOS).

We use the same device key to do the two signings, but update_engine
expects the key in RSA public key format. This CL extracts the public
key from x509 certificate and adds it to the system image.

Bug: 25715402
Change-Id: I6f6c1148534250ddb6d9e554175c7a35bceda99e
2016-01-20 21:29:00 -08:00
Colin Cross
d3f3ab77fd Set flag when using sdk tools in place
New version of build/ execute the tools from prebuilts/sdk/tools in
place, old versions copy them to $(HOST_OUT_EXECUTABLES).  build/ and
prebuilts/sdk often use mixed versions, set a flag that
prebuilts/sdk/tools/Android.mk can use to determine when it is using an
old build/ directory.

Change-Id: Iad2f96c35203fd3b0976946d229bfa8ab4acb150
2016-01-20 16:08:49 -08:00
Christopher Wiley
087f327304 Separate aidl dependencies from compiler dependencies
Both aidl and clang/gcc were putting their dependencies in the same
place.  Move aidl's dependencies to a file ending with .aidl.P rather
than the compiler's .P.

While here, inform kati that we have these special dep files.

Bug:26409006
Test: Rebuild, note both files being generated

Change-Id: I29d2eea822235d60713c2059f3a314e475eb5aa3
2016-01-20 12:54:09 -08:00
Narayan Kamath
1b5f487f10 Make a confusing error message clearer.
The java version doesn't matter here.

Change-Id: Ieb933f87d1255e7aea5d21b3ac96e4f1f755deea
2016-01-20 18:48:59 +00:00
Christopher Wiley
257796c62d Keep aidl generated C++ inside the generated folder
Transform ../ to dotdot/ for C++ generateds from .aidl source files.
This forces us to use one layer of indirection to calculate the build
rules for .aidl files, since we can no longer use a pattern rule.

This was tested by modifying system/tools/aidl's Android.mk to refer to
its .aidl files by going up two directories and then repeating the
directories again.  When I print the build rules with $(info) I see that
dotdot/ appears in appropriate places (C++ paths, but not .aidl paths).

Bug: 26407018
Test: Described above.

Change-Id: I397c9d10408c0c66d8b5a247a1f34eb4bf4f74ce
2016-01-20 09:17:20 -08:00
Yigit Boyar
5b97d086e9 Fix data binding source paths
Bug: 26581427

Change-Id: If8acc01fa610663248fa894ac04b3268bc77f739
2016-01-20 12:20:10 +00:00