StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
27,579 Commits 1 Branch 0 Tags
cdfbe4a8522b9a13ffe6ac1f826a1d6760f87d60
Commit Graph

9306 Commits

Author SHA1 Message Date
Neil Fuller
cdfbe4a852 Allow java targets to support 1.8 source / target 
This change enables build rules to specify:

LOCAL_JAVA_LANGUAGE_VERSION := 1.8

to enable -source 1.8 -target 1.8 for javac and
equivalent flags for Jack.

Bug: 26753820
Change-Id: I7991fafe4978485354663f091f4d78a0cc73ba26
 2016-01-28 13:42:28 +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
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
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
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
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
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
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