Commit graph

14257 commits

Author SHA1 Message Date
Dan Willemsen
a3d94873cf Merge changes from topic "soong_ui_java"
* changes:
  Remove Java PATH check, deprecate using PATH in Kati
  Remove JAVA_NOT_REQUIRED
2017-11-08 20:31:31 +00:00
Dan Willemsen
2ec3e4a257 Remove Java PATH check, deprecate using PATH in Kati
The Java PATH fixup is now handled within soong_ui, along with the
values of ANDROID_JAVA_HOME based on OVERRIDE_ANDROID_JAVA_HOME /
EXPERIMENTAL_USE_OPENJDK9.

Mark PATH as deprecated, so that any reads/writes will cause warnings.
This will be switched to obsolete once it's verified that there are no
more users.

Using PATH within Kati means that we've got to rebuild the ninja files
whenever your PATH changes, which is not ideal, especially since some of
the envsetup functions can change your PATH. In most cases you only need
to use PATH within the bash portions of the build rules ($${PATH}), which
isn't treated as a make variable, so won't produce an error.

I'm also planning on replacing PATH in a future change with our own
directory that has placeholders for everything in your PATH. This will
let us remove tools that shouldn't be used from the build.

Test: m nothing
Test: build/soong/build_test.bash on AOSP and internal master
Change-Id: I18d8d19cfba313ff9176345bf73ac34e8dbebfbb
2017-11-08 00:24:35 -08:00
Søren Gjesse
8639879e60 Merge "Use prebuild R8 for USE_R8=true" 2017-11-08 07:50:00 +00:00
Treehugger Robot
f599f4010e Merge "Add PRODUCT_ADB_KEYS" 2017-11-08 03:12:17 +00:00
Dan Willemsen
90879f50ea Remove JAVA_NOT_REQUIRED
This is no longer required.

Test: cs/JAVA_NOT_REQUIRED
Change-Id: I9f64e153c9f4af7df1c8dee4eaea3c7458be61c0
2017-11-07 17:43:36 -08:00
Treehugger Robot
4cb631f624 Merge changes from topic "system_default_prop"
* changes:
  Move ART default properties into system partition
  Add PRODUCT_SYSTEM_DEFAULT_PROPERTIES
2017-11-08 01:42:40 +00:00
Jaekyun Seok
5fb6a3eb9f Move ART default properties into system partition
Bug: 64661857
Bug: 68755013
Test: confirmed that ART default properties were stored in
/system/etc/prop.default on sailfish device

Change-Id: Ie07d3049de5ac395cfb9105e208fe7825080fa15
2017-11-08 00:56:43 +00:00
Søren Gjesse
c66d297e0a Use prebuild R8 for USE_R8=true
Instead of building R8 from external/r8 use the prebuild jar in
prebuilds/r8.

Test: m -j USE_R8=true

Change-Id: I9680ae430cdbc2b3beb910873c8eed27354f6af1
2017-11-07 16:21:50 +01:00
Dan Willemsen
dcd46870f2 Merge changes Ib37508d4,Ia46ac30e
* changes:
  Turn off Windows builds during BUILD_HOST_static
  zipalign: Fix build failure in static_sdk_tools.
2017-11-06 22:53:46 +00:00
Treehugger Robot
85e391b2a2 Merge changes I30a83721,I1094f213
* changes:
  Validate args passed by jacoco.mk to rm -rf
  Implement validate-paths-are-subdirs
2017-11-06 22:10:41 +00:00
Dan Willemsen
2a6e3b00b0 Turn off Windows builds during BUILD_HOST_static
We can only create static host binaries for Linux, so if static host
binaries are requested, turn off Windows cross-builds.

Test: m zipalign BUILD_HOST_static=1
Change-Id: Ib37508d4b502cd56dad535cb6eab648f625486c6
2017-11-06 11:12:09 -08:00
Treehugger Robot
76ceec724f Merge "Remove CFI-related WAR that is no longer necessary" 2017-11-06 18:54:45 +00:00
Pirama Arumuga Nainar
a8f75983a4 Remove CFI-related WAR that is no longer necessary
Bug: http://b/33678192

Clang has been updated past the revision mentioned in the work around.
So this is no longer necessary.

Test: Build
Change-Id: I08f8e75936bbc3527abc86ba4ce0f2c10382d332
2017-11-04 16:18:29 -07:00
Treehugger Robot
ab5ce7e1fe Merge "Move BUILD_*_FROM_FILE to config.mk" 2017-11-04 01:22:26 +00:00
Treehugger Robot
884af82b27 Merge "Switch deprecation message to $(warning)" 2017-11-04 00:50:14 +00:00
Colin Cross
e96bfdb337 Move BUILD_*_FROM_FILE to config.mk
BUILD_NUMBER_FROM_FILE and BUILD_DATETIME_FROM_FILE may need to
be referenced before main.mk has been parsed, move them to config.mk.

Bug: 68865363
Test: m -j TARGET_PRODUCT=full TARGET_BUILD_APPS=Gallery
      aapt dump xmltree out/target/product/generic/obj/APPS/Gallery_intermediates/package.apk AndroidManifest.xml | grep Version
Change-Id: I9361a394469e61fcdf5a2b9509ef2bb2b373d6e7
2017-11-03 16:35:02 -07:00
Dan Willemsen
0bd793815e Add PRODUCT_ADB_KEYS
This easily allow products to add custom adb keys for debuggable builds.
To use, provide a public key created by `adb keygen` to
PRODUCT_ADB_KEYS.

This way automated test farms don't need manual intervention to
authenticate to the device over adb, but we don't disable security for
everyone else.

Add an inherit-product-if-exists hook to aosp_* targets so that our
build servers can add a key for our test farms.

Bug: 32891559
Test: lunch aosp_marlin-userdebug; m bootimage
Test: lunch aosp_marlin-user; m bootimage
Change-Id: I1720644d89ec5289fbe99f95ebcdfbb3f3b20e67
2017-11-03 15:57:38 -07:00
Dan Willemsen
52f74821d3 Switch deprecation message to $(warning)
This way it shows up when using the old copy of lunch, which hides
stdout.

Test: source old_envsetup; lunch aosp_marlin-eng
Change-Id: I4bccf37fe69c0d7affb5805d05a2750e5d9a3da4
2017-11-03 15:52:50 -07:00
Jin Qian
09f3d18d56 Remove mkuserimg.sh from otatools
It has been replaced with mkuserimg_mke2fs.sh

Bug: 64395169
Change-Id: Iff4edba35062b6ecd3fec8b65422cab2a0707d3f
2017-11-03 12:16:15 -07:00
Jin Qian
bd532fbf2e Merge "Replace make_ext4fs with mke2fs" 2017-11-03 17:28:57 +00:00
Jaekyun Seok
b31b9bad66 Add PRODUCT_SYSTEM_DEFAULT_PROPERTIES
PRODUCT_SYSTEM_DEFAULT_PROPERTIES will be used to define system default
properties which should be installed in system partition.

Bug: 64661857
Test: confirmed that ART default properties are stored in
/system/etc/prop.default when they were defined in
PRODUCT_SYSTEM_DEFAULT_PROPERTIES.

Change-Id: Ia08c25d0c5805381c6e3fe63dd1d171e8d195b90
2017-11-03 15:32:47 +09:00
Jin Qian
95b2b695cd Replace make_ext4fs with mke2fs
make_ext4fs is deprecated and should be replaced with mke2fs

Bug: 64395169
Change-Id: Idfc8c0ee0ff598fdaa6f20bb0d4f6dca687a1b10
2017-11-02 16:27:41 -07:00
Alan Leung
65168a4143 Workaround for USE_D8 not in --dumpvars-mode
Bug: 68406220
Test: m checkbuild && USE_D8=false m checkbuild
Change-Id: Ia9916fb69b22449ff9eadd334f135807d999276f
2017-11-02 15:31:03 -07:00
Treehugger Robot
dee5abd85a Merge "Always use MKE2FS to build ext4 image" 2017-11-02 21:34:49 +00:00
Tobias Thierer
96257655c5 Merge "Skip Proguard for EXPERIMENTAL_USE_OPENJDK9=true" 2017-11-02 12:35:26 +00:00
Treehugger Robot
160edc1a90 Merge "Add HIDL boot-path libs to the PDK." 2017-11-02 01:10:31 +00:00
Colin Cross
cce2ea423a Merge "Pass PRODUCT_MINIMIZE_JAVA_DEBUG_INFO to soong" 2017-11-02 00:05:20 +00:00
Jin Qian
f0ebe872a2 Always use MKE2FS to build ext4 image
Bug: 64395169
Change-Id: I0118fe8ee5f677fdb9da616a11de304b2aefd0ba
2017-11-01 16:37:38 -07:00
Steven Moreland
58dbc79468 Add HIDL boot-path libs to the PDK.
Adding:
  target/common/obj/JAVA_LIBRARIES/android.hidl.base-V1.0-java_intermediates \
  target/common/obj/JAVA_LIBRARIES/android.hidl.base-V1.0-java-static_intermediates \
  target/common/obj/JAVA_LIBRARIES/android.hidl.manager-V1.0-java_intermediates \

Ref b/68767391. Currently, Soong java things cannot
build against things in the PDK.

Bug: 68433855
Test: platform.zip contains the 3 added intermediates
Change-Id: I18c556e7f535d9ab8f385b67ae217a2ce2eb8049
2017-11-01 16:27:01 -07:00
Treehugger Robot
fba0a560de Merge "Revert "Revert "CFI compatibility with static executables and nested archives""" 2017-11-01 22:16:00 +00:00
allenhair
e0a367384d Merge "Fix coverage build." 2017-11-01 17:22:16 +00:00
Nicolas Geoffray
21a3aef7d7 Merge "Add a product variable for priv-apps dependencies." 2017-11-01 13:40:20 +00:00
Vishwath Mohan
85f72449ae Revert "Revert "CFI compatibility with static executables and nested archives""
This reverts commit 8350c4c540.

Reverting the revert so a proper fix can be applied.

Change-Id: I69f106dfd294198e03a62bcd88c8f18033410141
2017-11-01 09:21:20 +00:00
Colin Cross
829a16ea2e Pass PRODUCT_MINIMIZE_JAVA_DEBUG_INFO to soong
Test: m with PRODUCT_MINIMIZE_JAVA_DEBUG_INFO=true
Change-Id: I265bde07e878cf2878f1d383f2555b7e7df7b457
2017-10-31 22:16:21 -07:00
Treehugger Robot
9767853ed0 Merge "Export AAPT-related variables to soong" 2017-10-31 23:39:24 +00:00
Treehugger Robot
46e7f55f6d Merge "Add hwbinder.jar to PDK." 2017-10-31 21:30:48 +00:00
Steven Moreland
266632f327 Add hwbinder.jar to PDK.
This is a no-install subset of frameworks.jar. Required
for HIDL libraries to be able to be built against at
build time.

Bug: 68433855
Test: hwbinder_intermediates are in platform.zip
Change-Id: Ia879c6a6908c00069eaf819278c9d5da6a649b68
2017-10-31 21:30:28 +00:00
Allen Hair
1d226aaf0f Fix coverage build.
Bug: 68713631
Test: m showcommands dist ANDROID_COMPILE_WITH_JACK=false \
    EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true \
    SKIP_BOOT_JARS_CHECK=true WITH_DEXPREOPT=false tests
Change-Id: Ic2540a7db26b7fe6d2ee2bb5feb54a4334deafcc
2017-10-31 14:06:00 -07:00
Tobias Thierer
89740664a5 Skip Proguard for EXPERIMENTAL_USE_OPENJDK9=true
Proguard doesn't support v53 class files. For now, this
CL simply replaces the Proguard step with a plain 'cp',
which is essentially a no-op.

To avoid apps exceeding the dex limit in this mode, this
CL also enables --multi-dex for those builds.

Test: Treehugger
Bug: 67673860
Change-Id: I17dc5d827360d606a0cac12e324f97e8dedbb630
2017-10-31 21:02:14 +00:00
Colin Cross
66a11b7ccc Merge "Revert "CFI compatibility with static executables and nested archives"" 2017-10-31 21:01:41 +00:00
Treehugger Robot
41f54061b2 Merge "Remove make version check" 2017-10-31 20:31:27 +00:00
Dan Willemsen
badd598c98 Merge "Mark some TARGET_* inputs as readonly" 2017-10-31 19:43:55 +00:00
Orion Hodson
8350c4c540 Revert "CFI compatibility with static executables and nested archives"
This reverts commit 3d3e1cf260.

Rationale: part of a group of commits that left aosp_x86_64 not
building. (See https://android-build.googleplex.com/builds/
submitted/4426589/aosp_x86_64-eng/latest/logs/build_error.log)

Bug: 30227045
Test: builds
Change-Id: Ie22590abe3d1cdccb8d141baf6480d49dedf8789
2017-10-31 17:41:16 +00:00
Dan Willemsen
2c3f8366e2 Mark some TARGET_* inputs as readonly
Nobody should be changing these past this point.

Test: build_test.bash
Change-Id: I6eb574a0b4d339912d4a09f8f752294871965041
2017-10-30 19:38:25 -07:00
Vishwath Mohan
22b6abc96d Merge "CFI compatibility with static executables and nested archives" 2017-10-31 01:42:16 +00:00
Colin Cross
c7bd540a6e Export AAPT-related variables to soong
Test: m checkbuild
Change-Id: I1816df9b9cc7b51e228d6d847cefa2d51a524897
2017-10-30 17:31:44 -07:00
Colin Cross
8b664d0d96 Merge "Remove PRODUCT_AAPT2_CFLAGS and PRODUCT_AAPT_FLAGS" 2017-10-30 20:58:08 +00:00
Dan Willemsen
ce9a40650d Remove make version check
We should never be using make here anymore, only Kati.

Test: none
Change-Id: I6e716d76e3656c2bad1cf17c6de92bdeda763d5b
2017-10-30 13:52:47 -07:00
Dan Willemsen
41cc5022c1 Merge "Prevent using config.mk from make, clean up unused code" 2017-10-30 20:11:32 +00:00
Stephen Hines
2957066979 Merge "Switch to clang-4393122." 2017-10-30 19:35:17 +00:00