Commit graph

27691 commits

Author SHA1 Message Date
Alex Klyubin
a80a8085e0 Revert "Sign APKs using SHA-256 instead of SHA-1 when possible."
This reverts commit 74df828cb5. This commit is breaking a build, again...

Change-Id: I2df561d68302ba4c83e90a64a7bf203645033a3b
2016-01-27 17:45:42 +00:00
Alex Klyubin
6c125375b0 Merge "Sign APKs using SHA-256 instead of SHA-1 when possible." am: 72d152f478
am: 5132fe2ef9

* commit '5132fe2ef9f29bd748a8d34898bd183ef257e937':
  Sign APKs using SHA-256 instead of SHA-1 when possible.
2016-01-27 17:04:09 +00:00
Alex Klyubin
5132fe2ef9 Merge "Sign APKs using SHA-256 instead of SHA-1 when possible."
am: 72d152f478

* commit '72d152f478a6a48c5e06053e440801f61d256a50':
  Sign APKs using SHA-256 instead of SHA-1 when possible.
2016-01-27 17:01:54 +00:00
Alex Klyubin
72d152f478 Merge "Sign APKs using SHA-256 instead of SHA-1 when possible." 2016-01-27 16:55:16 +00:00
Neil Fuller
104ecf8993 Merge "Doclava template changes associated with default methods" am: 26990b0f64
am: e71759c8ff

* commit 'e71759c8ff7cbedd1fe629cdbe86e141c4f1f470':
  Doclava template changes associated with default methods
2016-01-27 13:36:01 +00:00
Neil Fuller
e71759c8ff Merge "Doclava template changes associated with default methods"
am: 26990b0f64

* commit '26990b0f64e47c3f5366a03573f4d1e3408301d9':
  Doclava template changes associated with default methods
2016-01-27 13:32:37 +00:00
Neil Fuller
26990b0f64 Merge "Doclava template changes associated with default methods" 2016-01-27 13:25:43 +00:00
Neil Fuller
8f7d4b7474 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
(cherry-picked from commit ca59875e12)

Change-Id: I8489ad5010fc811b22167af50ba29221aac8b6cb
2016-01-27 11:57:34 +00:00
Shinichiro Hamaji
0cfb04c60e Merge "Write clean_steps.mk with multiple commands" am: 3e2f5d83a4
am: a4e26de266

* commit 'a4e26de26644f00b90232356fb8eae8ba761400d':
  Write clean_steps.mk with multiple commands
2016-01-27 08:41:56 +00:00
Shinichiro Hamaji
a4e26de266 Merge "Write clean_steps.mk with multiple commands"
am: 3e2f5d83a4

* commit '3e2f5d83a47d3f9b3f1a2f57c894dff64ae6c603':
  Write clean_steps.mk with multiple commands
2016-01-27 08:39:38 +00:00
Shinichiro Hamaji
3e2f5d83a4 Merge "Write clean_steps.mk with multiple commands" 2016-01-27 08:36:04 +00:00
Jesse Hall
a7ec71d62b Add libvulkan to base PRODUCT_PACKAGES
Change-Id: Ie0d583a349a6ef5542da91e5c1f1f348f02fe435
2016-01-27 00:20:35 -08:00
Shinichiro Hamaji
1326f65c2f Write clean_steps.mk with multiple commands
$(INTERNAL_CLEAN_STEPS) could be too big to be fit in a single
command line.

Bug: 26707439
Change-Id: Ieed6c772980d06c2418a9246b025bca7a6f568aa
2016-01-27 14:59:56 +09:00
Alex Deymo
0128329745 Merge "Place the META/ dir first in the target_files.zip." am: 2857b7a3d7
am: 95b0f7d3cc

* commit '95b0f7d3ccfc10659a0c6ac1eaed18284b4e9b55':
  Place the META/ dir first in the target_files.zip.
2016-01-27 03:35:09 +00:00
Alex Deymo
95b0f7d3cc Merge "Place the META/ dir first in the target_files.zip."
am: 2857b7a3d7

* commit '2857b7a3d7e2057cf60db36a528358a58a8711bc':
  Place the META/ dir first in the target_files.zip.
2016-01-27 03:33:20 +00:00
Alex Deymo
2857b7a3d7 Merge "Place the META/ dir first in the target_files.zip." 2016-01-27 03:28:53 +00:00
Alex Deymo
92cfd6fc2b Place the META/ dir first in the target_files.zip.
To help early verification of a target_files.zip being uploaded to our
servers, we place the META/ directory first in the .zip file, so checks
against the product_id.txt and product_version.txt don't need to wait
for the whole file to upload.

Note that META/*filesystem_config.txt files are generated and added to
the .zip file at a later point, so they are not included at the
beginning.

Bug: 26806325
TEST=`make dist` and `unzip -l out/dist/edison-target_files-eng.$USER.zip` shows most META/ files first.

Change-Id: I1955645412688f5c7823063ed56606b251daccfd
2016-01-26 18:52:10 -08:00
Yin-Chia Yeh
39f1d88038 Merge "Revert "Revert "Camera: add NDK camera library""" 2016-01-27 00:14:43 +00:00
Yin-Chia Yeh
821375c718 Revert "Revert "Camera: add NDK camera library""
This reverts commit e4329eb24f.

Change-Id: I414845a9e12148499db46a2c1b083d65175dea09
2016-01-27 00:13:51 +00:00
Kevin Cernekee
27498f2e39 Merge "README: Update docs" am: 30177c45b4
am: 753536092c

* commit '753536092c2cde7e959bdcaef9c45207351e9a18':
  README: Update docs
2016-01-26 23:53:34 +00:00
Kevin Cernekee
753536092c Merge "README: Update docs"
am: 30177c45b4

* commit '30177c45b4e61ae11749bf9106c64d1b1e2ae517':
  README: Update docs
2016-01-26 23:51:39 +00:00
Kevin Cernekee
30177c45b4 Merge "README: Update docs" 2016-01-26 23:45:37 +00:00
Yin-Chia Yeh
6f138d7eac Merge "Revert "Camera: add NDK camera library"" 2016-01-26 23:44:15 +00:00
Yin-Chia Yeh
e4329eb24f Revert "Camera: add NDK camera library"
This reverts commit 153005787d.

Breaking seed/andromeda build now. Investigating.

Change-Id: Id0884cc8b126694c9142d7771dc2187b10fdd415
2016-01-26 23:42:43 +00:00
Yin-Chia Yeh
c6eedaff72 Merge "Camera: add NDK camera library" 2016-01-26 22:30:08 +00:00
Adam Lesinski
497888de8c Use --pseudo-localize only with compile phase in AAPT2
AAPT2 does pseudo-localization in compile phase. Passing --pseudo-localize
to the link phase causes an error.
Bug:25958912

Change-Id: I6ced0979884cb0d718018f995f9b2f6476d401cb
2016-01-26 12:17:32 -08:00
Adam Lesinski
97f48ebeab Merge "Support to build with AAPT2" 2016-01-26 19:25:03 +00:00
Alex Klyubin
74df828cb5 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: I058393e0971d0d6559dbd69ea902754c6c7cab14
(cherry picked from commit de5bc04717)
2016-01-26 18:41:57 +00:00
Neil Fuller
541a288be1 Merge "Revert "Revert "Make OpenJDK 8 the default""" am: 385ac86745
am: 97ffb1ab83

* commit '97ffb1ab83e40ddb1218fd911f26f466d4c8675b':
  Revert "Revert "Make OpenJDK 8 the default""
2016-01-26 10:39:58 +00:00
Neil Fuller
97ffb1ab83 Merge "Revert "Revert "Make OpenJDK 8 the default"""
am: 385ac86745

* commit '385ac86745e2294e3ac8da7540659a2150ac7923':
  Revert "Revert "Make OpenJDK 8 the default""
2016-01-26 10:37:15 +00:00
Neil Fuller
385ac86745 Merge "Revert "Revert "Make OpenJDK 8 the default""" 2016-01-26 10:33:54 +00:00
Shinichiro Hamaji
d6cad82b89 Merge "Use dependency files generated by llvm-rs-cc" am: 19f99a742d
am: d39a629d3a

* commit 'd39a629d3ae3b072f419972356bcfa3fc340b1bd':
  Use dependency files generated by llvm-rs-cc
2016-01-26 06:41:53 +00:00
Ying Wang
dd71c85a45 Support to build with AAPT2
To build with AAPT2, set "USE_AAPT2=true".
TODO: Support split apks and generated resources from other than renderscript.

Bug: 25958912
Change-Id: I19b1a038824ce5b2a3d3ffadbce3173c845193fc
2016-01-25 22:41:43 -08:00
Shinichiro Hamaji
d39a629d3a Merge "Use dependency files generated by llvm-rs-cc"
am: 19f99a742d

* commit '19f99a742d393ffe41737d7c2e86c7b6ebe83ff0':
  Use dependency files generated by llvm-rs-cc
2016-01-26 06:40:11 +00:00
Shinichiro Hamaji
19f99a742d Merge "Use dependency files generated by llvm-rs-cc" 2016-01-26 06:36:02 +00:00
Shinichiro Hamaji
2e45fd036a Use dependency files generated by llvm-rs-cc
This was a regression since kati has been introduced. This CL
introduces include-depfile function to make it easier to write
Makefiles which work with both make and kati.

As ninja can handle only a single dependency file per a build
rule, now we merge multiple .d files generated by llvm-rs-cc
into a .d file.

Change-Id: Iaf64a8f0523ab98115837e6e06abd50f06620363
2016-01-26 14:24:46 +09:00
Yin-Chia Yeh
153005787d Camera: add NDK camera library
Bug: 23012001
Change-Id: I19b9d4c7a83f3baaf5e6102c5f0b7876546fe95d
2016-01-25 14:48:10 -08:00
Christopher Ferris
07b0a0da9f Merge "Add libc_malloc_debug to the always build list." am: 4d15f2f8c9
am: 093ca195bd

* commit '093ca195bd6a3e21c11ad04553b3fe5c6447ea97':
  Add libc_malloc_debug to the always build list.
2016-01-25 21:33:46 +00:00
Christopher Ferris
093ca195bd Merge "Add libc_malloc_debug to the always build list."
am: 4d15f2f8c9

* commit '4d15f2f8c9adc463c6e904667b9793a3f3544ef4':
  Add libc_malloc_debug to the always build list.
2016-01-25 21:31:54 +00:00
Christopher Ferris
4d15f2f8c9 Merge "Add libc_malloc_debug to the always build list." 2016-01-25 21:27:57 +00: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