Commit Graph

27546 Commits

Author SHA1 Message Date
Yin-Chia Yeh 153005787d Camera: add NDK camera library
Bug: 23012001
Change-Id: I19b9d4c7a83f3baaf5e6102c5f0b7876546fe95d
2016-01-25 14:48:10 -08:00
Josh Gao c2fd42c4db Merge "Error out if MALLOC_IMPL is defined." am: 1ae548d81d
am: 1559d44d1b

* commit '1559d44d1bd0e120d63e06ffe6eae479b35fc4b2':
  Error out if MALLOC_IMPL is defined.
2016-01-25 18:33:01 +00:00
Josh Gao 1559d44d1b Merge "Error out if MALLOC_IMPL is defined."
am: 1ae548d81d

* commit '1ae548d81daf1938be67d902512fa0c4d8f6d502':
  Error out if MALLOC_IMPL is defined.
2016-01-25 18:31:13 +00:00
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 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 982b1e1dba Merge "Make OpenJDK 8 the default" am: 797d3deb52
am: eaf7dbc90a

* commit 'eaf7dbc90a8ff7db7440fe021c4e7d5597efd40f':
  Make OpenJDK 8 the default
2016-01-25 10:54:51 +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 797d3deb52 Merge "Make OpenJDK 8 the default" 2016-01-25 10:45:34 +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 adad19674c Merge "Add an RS_CLANG variable as well for RenderScript." 2016-01-22 23:22:44 +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
Stephen Hines 4ac28d5258 Merge "Add clang rules for RS_LLVM_* tools." 2016-01-22 21:20:19 +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
Alex Klyubin 36e2384228 Merge "resolve merge conflicts of bb3d77ba95 to master." 2016-01-22 19:14:52 +00:00
Alex Klyubin 24b1c64c5b resolve merge conflicts of bb3d77ba95 to master.
Change-Id: Ib69e2a457c416b4da94fb76c231120632d47a07a
2016-01-22 11:05:03 -08:00
Neil Fuller 6b12575440 Merge "Doclava template changes associated with default methods" 2016-01-22 19:04:46 +00:00
Tao Bao f2ca92d9c4 Merge "Generate OTA packages for A/B update." am: bc6a66826a
am: 4f3015f4a2

* commit '4f3015f4a286d711e0d2c6178e60462d146570b3':
  Generate OTA packages for A/B update.
2016-01-22 18:53:29 +00:00
Alex Klyubin c8caf263be Merge "Make signapk sign using APK Signature Scheme v2." am: b86b5344a6
am: eafce4eefd

* commit 'eafce4eefdbf83b1cc6fd134e4916650c5768c9b':
  Make signapk sign using APK Signature Scheme v2.
2016-01-22 18:53:23 +00:00
Tao Bao 6c5f0acbe8 Merge "CleanSpec: Clean up /recovery/root/sdcard." am: b69d3b28a5
am: 8994f9ca38

* commit '8994f9ca383fa887e570f54ea78bfeb9fdd39b2e':
  CleanSpec: Clean up $(PRODUCT_OUT)/recovery/root/sdcard.
2016-01-22 18:53:15 +00:00
Neil Fuller ca59875e12 Doclava template changes associated with default methods
The ordering of method declaration modifiers changed slightly
to reflect the ordering given in:

http://docs.oracle.com/javase/specs/jls/se8/html/jls-8.html#jls-8.4.3
http://docs.oracle.com/javase/specs/jls/se8/html/jls-9.html#jls-9.4

Bug: 26241119
Change-Id: I1dfc014b3c6218cc1f7716a760d73c9b915f2d97
2016-01-22 10:37:17 -08:00
James Hawkins bb3d77ba95 Merge "bootstat: Add bootstat to the embedded target to support logging boot time across devices."
am: cb9da42c87

* commit 'cb9da42c878f5afb32513b441eaf72868163b655':
  bootstat: Add bootstat to the embedded target to support logging boot time across devices.
2016-01-22 18:28:19 +00:00
James Hawkins cb9da42c87 Merge "bootstat: Add bootstat to the embedded target to support logging boot time across devices." 2016-01-22 18:09:05 +00:00
Tao Bao 4f3015f4a2 Merge "Generate OTA packages for A/B update."
am: bc6a66826a

* commit 'bc6a66826a56607c2e6a02f70b21e9faa0793719':
  Generate OTA packages for A/B update.
2016-01-22 17:27:52 +00:00
Tao Bao bc6a66826a Merge "Generate OTA packages for A/B update." 2016-01-22 17:23:28 +00: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
Alex Klyubin eafce4eefd Merge "Make signapk sign using APK Signature Scheme v2."
am: b86b5344a6

* commit 'b86b5344a6b7703bfa36a203f34ca3a117051587':
  Make signapk sign using APK Signature Scheme v2.
2016-01-22 04:12:30 +00:00
Alex Klyubin b86b5344a6 Merge "Make signapk sign using APK Signature Scheme v2." 2016-01-22 04:07:45 +00:00
Tao Bao 8994f9ca38 Merge "CleanSpec: Clean up /recovery/root/sdcard."
am: b69d3b28a5

* commit 'b69d3b28a5a00050d946921a7e14b5eae203ebac':
  CleanSpec: Clean up $(PRODUCT_OUT)/recovery/root/sdcard.
2016-01-22 01:33:03 +00:00
Tao Bao b69d3b28a5 Merge "CleanSpec: Clean up $(PRODUCT_OUT)/recovery/root/sdcard." 2016-01-22 01:28:30 +00:00
Tao Bao 6b10089bd6 CleanSpec: Clean up $(PRODUCT_OUT)/recovery/root/sdcard.
Incremental build going across CL in [1] needs to remove the old
symlink to avoid hitting mkdir error.

[1]: commit 3f56a33041

Change-Id: Iff62ed55eb2782ba3e1e9b6de39a691de2427384
2016-01-21 17:18:47 -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
James Hawkins bc5dc64232 bootstat: Add bootstat to the embedded target to support logging boot
time across devices.

Bug: 21724738
Change-Id: I165e8597103ea235a0826e321a1658823c4b4664
2016-01-21 15:39:45 -08: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