Commit Graph

34390 Commits

Author SHA1 Message Date
David Gross
bb67e3ae54 Merge "Teach mgrep to find soong/*.go files."
am: 46d9bf8f9a

Change-Id: I22910cf7fe9b08b2b98994e60a96769f90b680f7
2017-05-18 18:17:07 +00:00
David Gross
46d9bf8f9a Merge "Teach mgrep to find soong/*.go files." 2017-05-18 18:13:03 +00:00
Tobias Thierer
64517075a5 Merge "Revert "build/make/core: Fix fragile assumptions about build toolchain.""
am: a0203a6544

Change-Id: I28b8d2e5781180cecdcf4e8497e6806bbc7be9c6
2017-05-18 14:31:51 +00:00
Tobias Thierer
a0203a6544 Merge "Revert "build/make/core: Fix fragile assumptions about build toolchain."" 2017-05-18 14:25:15 +00:00
Tobias Thierer
4c764abf37 Revert "build/make/core: Fix fragile assumptions about build toolchain."
This reverts commit e2a8da2683.

Reason for revert: broke build. 

Change-Id: I951cc070adbbbd784aa4f8e171e543c35d0249de
2017-05-18 14:00:29 +00:00
Tobias Thierer
68587c24a9 Merge "build/make/core: Fix fragile assumptions about build toolchain."
am: b371c7756a

Change-Id: Ibed8048b85e2c287fdbe0a545986d57400ef42c6
2017-05-18 12:13:11 +00:00
Tobias Thierer
b371c7756a Merge "build/make/core: Fix fragile assumptions about build toolchain." 2017-05-18 12:04:31 +00:00
Tobias Thierer
e2a8da2683 build/make/core: Fix fragile assumptions about build toolchain.
- explicitly set the path where desugar will dump temporary class files.
  This ensures that the system property is set before it is read during
  InnerClassLambdaMetafactory.<clinit>. Before this CL, the system
  property was set by Desugar.createAndRegisterLambdaDumpDirectory(),
  which may run too late.

- explicitly specify -source 1.8 for droiddoc's javadoc run.
  Previously, the command used the language version of the build
  toolchain, which might fail due the backward-incompatible restrictions
  imposed by the proposed module system.

  Some Android build targets use LOCAL_JAVA_LANGUAGE_VERSION 1.7,
  but droiddoc combines sources from multiple build targets and there
  where no backwards incompatible changes in 1.8, so it should be fine
  to use 1.8 for code from either language level.

Bug: 38318052
Bug: 38225656
Bug: 38177295
Test: make clean && make checkbuild docs
      (using OpenJDK 8 toolchain)

Change-Id: Ie5fe0502dfe2f99fc58b1a723b7c18d5896a2646
2017-05-17 22:53:38 +01:00
Vishwath Mohan
eff6a8502d Merge "Always use non-sanitized library locations for JNI."
am: bbf833c7e1

Change-Id: I3c26812c7799f2757e642ca4c7a4a4a12d7c3449
2017-05-17 20:25:32 +00:00
Treehugger Robot
bbf833c7e1 Merge "Always use non-sanitized library locations for JNI." 2017-05-17 20:07:55 +00:00
Vishwath Mohan
d4dbf7921d Always use non-sanitized library locations for JNI.
This CL changes the build system to always look for shared JNI
libraries at their unsanitized install locations.

Bug: 38309771
Test: m -j40 && SANITIZE_TARGET="address" m -j40
Change-Id: Icb9d4f5365def6ea7a780553f455f41d2cb8b8bf
2017-05-17 11:02:20 -07:00
David Sehr
b11e7370d7 Merge "Add dexdiag tool to images"
am: 2f4e8f46e4

Change-Id: I32bdc89d2281c3e3ca4949e0fde5ae0c3019f24d
2017-05-17 17:19:18 +00:00
David Sehr
2f4e8f46e4 Merge "Add dexdiag tool to images" 2017-05-17 17:13:28 +00:00
Dan Willemsen
39eaf668d2 Merge "Start deprecating OVERRIDE_BUILT_MODULE_PATH"
am: 34b3a41217

Change-Id: I56c9044adf5fbfcc672ec69b4f071f5b5822be8f
2017-05-17 00:06:03 +00:00
Treehugger Robot
34b3a41217 Merge "Start deprecating OVERRIDE_BUILT_MODULE_PATH" 2017-05-16 23:59:25 +00:00
Alan Leung
16168c016d Merge "Allows DX alternative Jar."
am: 26d769ea3f

Change-Id: If8d94f7a9a39ea91c15419df7d4ddc300dcbe63d
2017-05-16 21:59:23 +00:00
Treehugger Robot
26d769ea3f Merge "Allows DX alternative Jar." 2017-05-16 21:50:49 +00:00
Dan Willemsen
0cf52d84d3 Start deprecating OVERRIDE_BUILT_MODULE_PATH
We no longer need to use $PRODUCT_OUT/obj/lib as a linker path, we can
directly specify the shared libraries to the linker.

So install both into the standard built module path, and declare a copy
rule to the old OVERRIDE_BUILT_MODULE_PATH location. This way we can
incrementally move users from the old location to the standard path.

Test: m -j
Change-Id: I3c6140ac26e5e5ca486337ce0192e15e530da32c
Merged-In: I3c6140ac26e5e5ca486337ce0192e15e530da32c
2017-05-16 21:16:20 +00:00
Alan Leung
83857b6cbd Allows DX alternative Jar.
Test: m -j20 ANDROID_COMPILE_WITH_JACK=false DX_ALT_JAR=/mnt/m02/dx_alt.jar

Change-Id: I6163280101ff973bc8202a82d2fed42cf0ce6209
(cherry picked from commit b147846b67)
2017-05-16 13:34:42 -07:00
Colin Cross
adb96ae66a Merge "Normalize timestamps in host java libraries"
am: 90edf85667

Change-Id: I88c8abd5c1d3fec72f73d439253341b1c9ce778a
2017-05-16 19:58:44 +00:00
Treehugger Robot
90edf85667 Merge "Normalize timestamps in host java libraries" 2017-05-16 19:46:39 +00:00
David Sehr
5c2be9a291 Add dexdiag tool to images
Allow on-device analysis of dex memory usage by adding dexdiag to the
image.

Bug: 38181622
Test: adb shell "dexdiag"
Change-Id: I2142b5e42eae8cc01755d0e86c179c2fa86be00c
(cherry picked from commit 76f5fe5b63)
2017-05-16 11:41:49 -07:00
Dan Willemsen
39187e8882 Merge changes from topics 'soong_ui_installclean', 'soong_ui_version', 'soong_ui_clean'
am: 212c418ee7

Change-Id: I6596af49a99a6167a8908525ff8fe1c16e456e31
2017-05-16 18:09:41 +00:00
Colin Cross
1664b90d67 Normalize timestamps in host java libraries
Remove timestamps from jar files in host java libraries to get
consistent results between builds to help with build artifact
caching.

Bug: 38215808
Test: sha1sum desugar.jar && touch Desugar.java && m -j desugar && sha1sum desugar.jar
Change-Id: I1ecac9b2b80f673937086686540ab0736259df1b
2017-05-16 11:07:28 -07:00
Sen Jiang
7cdc14d8b0 Merge "Add support for avbtool in custom_images."
am: 8a8ca3438b

Change-Id: I254462e57038902852be421cbfb4cccab9dbe444
2017-05-16 18:02:37 +00:00
Dan Willemsen
212c418ee7 Merge changes from topics 'soong_ui_installclean', 'soong_ui_version', 'soong_ui_clean'
* changes:
  Move auto installclean to soong_ui
  Move version checking to soong_ui
  Move clean/clobber to soong_ui
  Allow disabling of CleanSpec functionality
2017-05-16 18:02:04 +00:00
Sen Jiang
8a8ca3438b Merge "Add support for avbtool in custom_images." 2017-05-16 17:55:54 +00:00
Sen Jiang
5b0fe18feb Add support for avbtool in custom_images.
Set CUSTOM_IMAGE_AVB_ENABLE := true to enable avb, add_hashtree_footer
args can be added in CUSTOM_IMAGE_AVB_ADD_HASHTREE_FOOTER_ARGS.

Bug: 38319818
Test: m custom_images

Change-Id: Ia452dc5ce8b55bcbd3abba9e965b72e78fd8c104
2017-05-15 17:34:42 -07:00
Dan Willemsen
85e55ceff2 Move auto installclean to soong_ui
This way kati doesn't need to keep state for which build got run last,
and we have to run kati less often. This was forcing another kati run
for an empty out directory, and a kati run (or two) every time you
switched products that shared a device.

Bug: 35970961
Test: m clean; m -j blueprint_tools; m -j blueprint_tools; m -j blueprint_tools
Test: lunch aosp_arm-eng; m -j blueprint_tools; lunch full-eng; m -j blueprint_tools; <repeat>
Change-Id: I825a0868fb7059016a940c76244527432e3e7cff
2017-05-15 14:18:10 -07:00
Dan Willemsen
3eb44160e0 Move version checking to soong_ui
This removes versions_checked.mk that caused kati to regenerate the
ninja file 3 times for a clean out directory. Kati needs to regenerate
every time that we write a file that we also read. soong_ui doesn't have
this problem.

Bug: 35970961
Test: m clean; m -j blueprint_tools; m -j blueprint_tools; m -j blueprint_tools
Test: $OUT_DIR/versions_checked.mk no longer exists
Change-Id: I14b67dc275ea3daa77a7315c2985dc73d77fd07c
2017-05-15 14:02:38 -07:00
Dan Willemsen
bd8ac3284d Move clean/clobber to soong_ui
So that we don't have to load up all the makefile state just to remove
the output directory.

Starting from a completely empty out directory:
 kati:    16s
 soong_ui: 2.0s

From a minimal out directory (m -j blueprint_tools):
 kati:     3.8s
 soong_ui: 0.4s

Test: m -j clean
Test: m -j clobber
Change-Id: Iec1ce032c7cc7ed102430080e857fc421b66309c
2017-05-15 14:02:38 -07:00
Dan Willemsen
3715001fe5 Allow disabling of CleanSpec functionality
This is only intended for testing purposes -- so that we can run build
system tests and verify that kati only gets run once for each
configuration. CleanSpecs necessarily write state that require us to
re-run kati twice.

Test: export NO_ANDROID_CLEANSPEC=true; rm -rf out; m -j; m -j
Change-Id: I635a8d8b6754dff82fbc7f20c500d06d7cf6c4f2
2017-05-15 14:02:38 -07:00
Yueyao Zhu
793a9bb490 Merge "add dtbo support for ota"
am: 294d5c5f07

Change-Id: Icf2a67ef36b2cbfa5d46e72b9e446cd7ed5e2d1c
2017-05-15 16:56:54 +00:00
Treehugger Robot
294d5c5f07 Merge "add dtbo support for ota" 2017-05-15 16:49:46 +00:00
Paul Duffin
23eb5019bc Merge "Add c/a/i/u/* to the list of injar filters"
am: 9198da8c21

Change-Id: Ic665b9ee826fb782ca4ce8b6b54339fb272f132c
2017-05-15 15:48:50 +00:00
Treehugger Robot
9198da8c21 Merge "Add c/a/i/u/* to the list of injar filters" 2017-05-15 15:44:04 +00:00
Paul Duffin
e949585a62 Add c/a/i/u/* to the list of injar filters
Previous change that moved com.android.internal.util.Predicate
to the legacy-android-test JAR caused a proguard build breakage
due to duplicate classes in the application and library. This
fixes it in the same way as previous issues with junit and
android.test classes were resolved by excluding those classes
from the application JAR.

Bug: 30188076
Test: make checkbuild and make -j ANDROID_FORCE_JACK_ENABLED=disabled checkbuild
Change-Id: Ica0089607187f970251ddba339a1f71d4cad80cc
2017-05-15 15:17:55 +01:00
Julius D'souza
e255054a08 Merge "Add the option to reserve headroom for partition images. This is useful for devices with low disk space with different build variants."
am: bba00b2cb9

Change-Id: I3a070c4545f03280574a8cd5b6865db6ed1a33ef
2017-05-13 01:44:21 +00:00
Treehugger Robot
bba00b2cb9 Merge "Add the option to reserve headroom for partition images. This is useful for devices with low disk space with different build variants." 2017-05-13 01:37:25 +00:00
Yueyao Zhu
889ee5e7d3 add dtbo support for ota
Test: make dist and locally push ota on a device
Change-Id: I920b98f20e248b437955b2a963eb69ed2ddb8d45
2017-05-12 17:50:46 -07:00
Tianjie Xu
ca3aad1943 Merge "Add a script to parse an block-based ota package"
am: f34d435925

Change-Id: I3216b5ef25f55f8f44e84eeb9101cf9af01011fd
2017-05-11 22:12:12 +00:00
Tianjie Xu
f34d435925 Merge "Add a script to parse an block-based ota package" 2017-05-11 21:52:10 +00:00
Tao Bao
c3947ece97 Merge "OTA Tools: Handle password encrypted keys"
am: 4e1c113554

Change-Id: Icc7400eb9369f5d6e3551914f5cae0ac2c923cea
2017-05-11 19:46:48 +00:00
Tao Bao
4e1c113554 Merge "OTA Tools: Handle password encrypted keys" 2017-05-11 19:28:07 +00:00
Christian Oder
f63e2cd47b OTA Tools: Handle password encrypted keys
* Add logic to handle decrypted keys from common.GetKeyPassword in
WriteABOTAPackageWithBrilloScript.

* Get the keys passwords in main and store them in OPTIONS.key_passwords.
This allows accessing them in WriteABOTAPackageWithBrilloScript and SignOutput
so it's only required to ask for the password once, while allowing to use
decrypted signing keys.

Test: ota_from_target_files.py on marlin and angler respectively.
Change-Id: I7c9b0198855a4b630c52b8552e904f312f09c4ce
2017-05-10 16:54:42 -07:00
David Gross
d1d6fc5cff Teach mgrep to find soong/*.go files.
Test: $ cd $ANDROID_BUILD_TOP
      $ mgrep FORCE_BUILD_LLVM_DEBUG
      ./external/llvm/llvm-host-build.mk:24:ifeq ($(FORCE_BUILD_LLVM_DEBUG),true)
      ./external/llvm/soong/llvm.go:44:       if ctx.AConfig().IsEnvTrue("FORCE_BUILD_LLVM_DEBUG") {
      $ cd external/llvm
      $ mgrep FORCE_BUILD_LLVM_DEBUG
      ./llvm-host-build.mk:24:ifeq ($(FORCE_BUILD_LLVM_DEBUG),true)
      ./soong/llvm.go:44:     if ctx.AConfig().IsEnvTrue("FORCE_BUILD_LLVM_DEBUG") {

Change-Id: Ibe114550a8022d792a0c10c766c964a67721a6ba
2017-05-10 10:49:44 -07:00
George Burgess IV
c352502062 Merge "make: add __clang_analyzer__ to clang-tidy"
am: 57273013cf

Change-Id: Iea1d4ded4dc9e2d5d461358cf5c6cff6dcb68bfd
2017-05-10 04:48:31 +00:00
Treehugger Robot
57273013cf Merge "make: add __clang_analyzer__ to clang-tidy" 2017-05-10 04:34:42 +00:00
Dan Willemsen
9efa174836 Merge changes Id0d167e6,I290a02b0
am: 90573e75a8

Change-Id: I352aa1d12fdf76b41b8fb9e7341707d7fbeec764
2017-05-10 02:36:20 +00:00
Treehugger Robot
90573e75a8 Merge changes Id0d167e6,I290a02b0
* changes:
  Clean LOCAL_RESOURCE_DIR paths
  Implement clean-path
2017-05-10 02:22:17 +00:00