Commit Graph

34101 Commits

Author SHA1 Message Date
Colin Cross 8fb3f39bcd Merge "Move comments to the previous line"
am: 906a3ea5d6

Change-Id: I70787abb1a80987fb89a4444c68b9658c80c0622
2017-03-28 22:27:44 +00:00
Treehugger Robot 906a3ea5d6 Merge "Move comments to the previous line" 2017-03-28 22:17:52 +00:00
Colin Cross 349a7a7f1a Move comments to the previous line
End-of-line comments cause the variable to be set to a space, which
confuses using ifdef on it.

Test: builds
Change-Id: I7b1eb3b9febff1a5a5fca1e6623b2b36d538dacc
Merged-In: I7b1eb3b9febff1a5a5fca1e6623b2b36d538dacc
2017-03-28 13:24:45 -07:00
Makoto Onuki 0a069a74c2 Merge "Add USE_FILESLIST_GO to switch to fileslist.go"
am: d625ef2894

Change-Id: I6d869be0b7ab9084168803ceaaf58fc2ba3c8da5
2017-03-28 16:50:21 +00:00
Makoto Onuki d625ef2894 Merge "Add USE_FILESLIST_GO to switch to fileslist.go" 2017-03-28 16:41:05 +00:00
Steve Muckle 9c0198e6e9 Merge "Fix modules.dep breakage with multiple module dependencies"
am: 73461abd0c

Change-Id: I96080a797abb1f9d9887ab993082ce0c10a931ca
2017-03-28 01:21:57 +00:00
Treehugger Robot 73461abd0c Merge "Fix modules.dep breakage with multiple module dependencies" 2017-03-28 01:11:39 +00:00
Mark Salyzyn ccf3fcaba0 Merge "fs_config_generate: README"
am: 058e2f7b19

Change-Id: Id8cf39f5657640e099468abed741f0fa928a55f9
2017-03-27 23:33:20 +00:00
Mark Salyzyn 058e2f7b19 Merge "fs_config_generate: README" 2017-03-27 23:29:02 +00:00
Steve Muckle b74e0b9b0d Fix modules.dep breakage with multiple module dependencies
If a module has multiple dependencies, the current regexp for making
the dependencies absolute paths only modifies the first dependency.

Test: build sailfish with module configuration including multiple
      dependencies
Change-Id: I8f2b40c8c5ec228aa8f831086bcdd561c8714910
2017-03-27 13:48:28 -07:00
Jeff Vander Stoep 6d418a86b7 Merge "embedded.mk: Make phony selinux_policy"
am: b30c12df3e

Change-Id: Iba9b4c92d1772f50f77a112747b32d4c4290e363
2017-03-27 20:06:41 +00:00
Treehugger Robot b30c12df3e Merge "embedded.mk: Make phony selinux_policy" 2017-03-27 20:03:04 +00:00
Jeff Vander Stoep 2064364765 embedded.mk: Make phony selinux_policy
Moves selinux policy build decisions to system/sepolicy/Android.mk.
This is done because the PRODUCT_FULL_TREBLE variable isn't available
in embedded.mk and TARGET_SANITIZE isn't available to dependencies of
init.

Test: Build/boot Bullhead PRODUCT_FULL_TREBLE=false
Test: Build/boot Marlin PRODUCT_FULL_TREBLE=true
Test: Build Marlin TARGET_SANITIZE=address. Verify asan rules are
      included in policy output.

Bug: 36138508
Change-Id: I792786cd867bae3e1baeb824167a848948a719df
2017-03-26 14:51:38 -07:00
Tianjie Xu 0e6a7f1838 Merge "Fix unittest for blockimgdiff"
am: 36bcb78eb9

Change-Id: If32bcc2356fc4b251481b3b7d664af6736bc3caf
2017-03-26 05:30:58 +00:00
Tianjie Xu 36bcb78eb9 Merge "Fix unittest for blockimgdiff" 2017-03-26 05:25:48 +00:00
Dimitry Ivanov 3fd5bf0f82 Merge "Add ld.config.txt to rootdir/etc"
am: 86559441a1

Change-Id: I35da84dceb546c04494e16106745b63cc80234b0
2017-03-25 05:21:15 +00:00
Treehugger Robot 86559441a1 Merge "Add ld.config.txt to rootdir/etc" 2017-03-25 05:17:32 +00:00
Tianjie Xu a011dec9b2 Fix unittest for blockimgdiff
The test broke due to api change in constructor of Transfer.

Bug: 36456381
Test: blockimgdiff test passes
Change-Id: Ic73b66f8fb6141ff6f50c113b0d8cc55d34e0b5d
2017-03-24 16:28:16 -07:00
Dan Willemsen eb90e156e1 Merge "Fix fileslist for system other image"
am: b05fe25b9f

Change-Id: I63edd0d9aa171189911948a9da80b5b5e6368109
2017-03-24 23:17:12 +00:00
Makoto Onuki 9fe97e231b Add USE_FILESLIST_GO to switch to fileslist.go
fileslist.go is still disabled by default.  To enable, use:
USE_FILESLIST_GO=true m -j

Bug: 36274890
Test: Manual, with m -j

Change-Id: I722e17fa7fb6ba91e2b2c44cd7524d974cbe4a56
2017-03-24 16:12:16 -07:00
Treehugger Robot b05fe25b9f Merge "Fix fileslist for system other image" 2017-03-24 23:10:02 +00:00
Dan Willemsen 5c8542e1b4 Fix fileslist for system other image
This got lost from the previous backport, since systemotherimage wasn't
in AOSP yet.

(The Merged-In is a random Change-Id only on master so that this only
merges up to master)

Test: lunch aosp_marlin-eng; m -j systemotherimage
Change-Id: I92c05f27c92d877f3b83e5c5ae2e76728eb162bd
Merged-In: Iafed66e19bc114552b0261dd299379dbb37873c6
2017-03-24 21:26:21 +00:00
Christopher Ferris 37f3a728a0 Merge "Small fixes for environment variables."
am: fd0cb496b1

Change-Id: Ie65c27691e5a2ebb8923d83d16eae182744dc93f
2017-03-24 16:19:43 +00:00
Christopher Ferris fd0cb496b1 Merge "Small fixes for environment variables." 2017-03-24 16:15:07 +00:00
Mark Salyzyn 87ba0144f8 fs_config_generate: README
Test: none
Bug: 36071012
Change-Id: If30461fb9c522f705874fdfdc2b7cd54a5c3732e
2017-03-24 08:57:27 -07:00
Dan Willemsen e9e4001b34 Merge "Depend on (bs|img)diff for target-files-package"
am: 90151623fc

Change-Id: I99856e5d45ce90f36a2432fb8d05360384e3f2b9
2017-03-24 07:29:42 +00:00
Dan Willemsen 90151623fc Merge "Depend on (bs|img)diff for target-files-package" 2017-03-24 07:24:36 +00:00
Dan Willemsen d79a08f9fb Depend on (bs|img)diff for target-files-package
add_img_to_target_files may use these to create the recovery patch, so
add a dependency. They were previously a transitive dependency through
the system image to the standalone recovery patch creation.

Bug: 36575896
Test: rm out/host/linux-x86/bin/imgdiff; m -j target-files-package
Change-Id: I2a43220e94c09393e88e1d9950032f5665a0d2ce
2017-03-23 22:09:06 -07:00
Colin Cross 7b5dc8ad3e Merge "Add TARGET_PLATFORM_VERSION to lunch"
am: a007142381

Change-Id: Ic9b38a74041f839300f82a4ecfb724079b62a900
2017-03-24 00:24:16 +00:00
Treehugger Robot a007142381 Merge "Add TARGET_PLATFORM_VERSION to lunch" 2017-03-24 00:14:01 +00:00
Dan Willemsen 5179e70cc3 Merge "Ensure /system/vendor symlink exists in target-files-package"
am: ac8b2ab702

Change-Id: Iff5b31f1b46c9d1740d5d26e48e3cae5fed48602
2017-03-23 21:57:02 +00:00
Treehugger Robot ac8b2ab702 Merge "Ensure /system/vendor symlink exists in target-files-package" 2017-03-23 21:42:28 +00:00
Dan Willemsen f75d7fa8ea Ensure /system/vendor symlink exists in target-files-package
This used to happen in the system image creation, but the target-files
didn't really depend on the system image, so I removed that dependency.
But then we weren't creating the symlink all the time.

This should be safe to run in parallel with the same link step in the
system creation.

Bug: 36540023
Test: m -j target-files-package, ensure vendor symlink is created
      without system.img.
Change-Id: I37059fa1ce759a0870dc4c65c5515050992245e2
2017-03-23 13:22:46 -07:00
Christopher Ferris 55257d2b78 Small fixes for environment variables.
Fix all of the leaking of local variables by marking locals properly.

Fix a case where ANDROID_TOOLCHAIN_2ND_ARCH is set incorrectly.

Test: lunch'd aosp_angler-userdebug and then aosp_fugu-userdebug
Test: and verified ANDROID_TOOLCHAIN_2ND_ARCH is set properly after
Test: the first lunch and unset after the second lunch.
Test: Also attempt to build the two targets.
Change-Id: I49548e0d6654bfb1105a6ecaf2705825b9ddf3a5
2017-03-23 11:12:04 -07:00
Colin Cross 8873713f36 Add TARGET_PLATFORM_VERSION to lunch
lunch can now take combos in the form:
$TARGET_PRODUCT
$TARGET_PRODUCT-$TARGET_BUILD_VARIANT
$TARGET_PRODUCT-$TARGET_BUILD_VARIANT-$TARGET_PLATFORM_VERSION

If all 3 are not specified the unspecified ones will take the
default values provided by the build system (eng, and currently
OPR1).

In addition, error handling for invalid products, variants and
versions is moved to the build system.

Bug: 34972208
Test: build/make/tests/envsetup_tests.sh
Change-Id: Ib0aaa98633448ba9bd8df911704c9cb3a8ebbe85
2017-03-23 09:44:08 -07:00
Colin Cross ce9dfdeee6 Merge "Desugar when javac version is 1.7"
am: ed44a54991

Change-Id: I71b868d277fbf81700cd85e45a1f852c90247120
2017-03-23 02:57:24 +00:00
Treehugger Robot ed44a54991 Merge "Desugar when javac version is 1.7" 2017-03-23 02:49:40 +00:00
Dan Willemsen f4b5c3139c Merge changes I84e4f878,I37b65eb9
am: bfc4f5e339

Change-Id: I2281b87887b0e5bb6e66d3a8446f84fdccd654dc
2017-03-23 02:20:53 +00:00
Treehugger Robot bfc4f5e339 Merge changes I84e4f878,I37b65eb9
* changes:
  Parallelize system*.img and target-files-package
  Add missing dependencies of targets-files-package
2017-03-23 02:16:35 +00:00
Colin Cross 200951bdb7 Desugar when javac version is 1.7
Modules compiled with javac 1.7 may have LOCAL_STATIC_JAVA_LIBRARIES
pointing to jars that contain code compiled with javac 1.8, and may
need desugaring.

Test: m -j ANDROID_COMPILE_WITH_JACK=false checkbuild
Change-Id: I470fc0a2fba51179a3ef95986cb3030194cd8f1c
2017-03-22 18:37:53 +00:00
Tao Bao 3918b311f5 Merge "Add a missing default value for OPTIONS.extracted_input."
am: 2c280271ac

Change-Id: I89aeb98b2ce040801de5daa4f1856b93c9afadec
2017-03-22 07:38:40 +00:00
Treehugger Robot 2c280271ac Merge "Add a missing default value for OPTIONS.extracted_input." 2017-03-22 07:34:15 +00:00
Tao Bao 5f8ff9319b Add a missing default value for OPTIONS.extracted_input.
Test: ota_from_target_files.py without --extracted_input_target_files.
Change-Id: Ieaba43fa557b544b24f3eeccd68ac289d1fe3d31
2017-03-21 22:36:20 -07:00
Dan Willemsen 02e29c5b48 Merge "Speed up non-AB ota_from_target_files in the build system"
am: 47ba4239c8

Change-Id: I00f06fa1f26563e9c0d3951df986f85105ea8946
2017-03-22 02:23:06 +00:00
Colin Cross 8a378154dd Merge "Use new naming scheme for TARGET_PLATFORM_VERSION"
am: 53d66b5903  -s ours

Change-Id: I6b5645bf8dfe62de83d0fcfd564ee83aa7e83d3d
2017-03-22 02:22:53 +00:00
Colin Cross f6cf099b27 Use new naming scheme for TARGET_PLATFORM_VERSION
Replace the current naming scheme for TARGET_PLATFORM_VERSION
(O, ODR1, OMR1, P) with one that matches the user-visible
branch version (OPR1, OPD1, OPM1, PPR1).

Temporarily map P -> PPR1 to decouple this change from updating
the build servers.

Bug: 34972208
Test: m -j TARGET_PLATFORM_VERSION=PPR1
Test: m -j TARGET_PLATFORM_VERSION=P
Change-Id: Ib00b13abe79a744e344b88bb1d800524ab09d585
(cherry picked from commit d8bc190a63)
2017-03-22 01:48:03 +00:00
Dan Willemsen 47ba4239c8 Merge "Speed up non-AB ota_from_target_files in the build system" 2017-03-22 01:41:39 +00:00
Treehugger Robot 53d66b5903 Merge "Use new naming scheme for TARGET_PLATFORM_VERSION" 2017-03-22 01:19:53 +00:00
Jaesoo Lee 3973c2af63 Merge "removed "android.hardware.configstore@1.0-impl" from PRODUCT_PACKAGES"
am: 946af3fa5d

Change-Id: I59d10ade7c801359365d847d6c433d719a4128c2
2017-03-22 01:04:26 +00:00
Jaesoo Lee 946af3fa5d Merge "removed "android.hardware.configstore@1.0-impl" from PRODUCT_PACKAGES" 2017-03-22 00:42:33 +00:00