Commit Graph

12780 Commits

Author SHA1 Message Date
Dan Willemsen
29651c25fa Merge "Depend on (bs|img)diff for target-files-package" am: 90151623fc
am: e9e4001b34

Change-Id: Icb85efa78c4649a7f849dc5274a5a69413468966
2017-03-24 07:31:40 +00: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
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
1b81278572 Merge "Add TARGET_PLATFORM_VERSION to lunch" am: a007142381 am: 7b5dc8ad3e
am: 086d109f35

Change-Id: If005f3917b1f1664b111ce7d070590a47a259ce5
2017-03-24 00:27:16 +00:00
Colin Cross
086d109f35 Merge "Add TARGET_PLATFORM_VERSION to lunch" am: a007142381
am: 7b5dc8ad3e

Change-Id: If12b3c0f688a8d4a42f188b98a1f18b86da57d13
2017-03-24 00:25:45 +00: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
TreeHugger Robot
13af7e6e8d Merge "Increase max heap size for javac to 2GB." 2017-03-23 23:21:19 +00:00
Dan Willemsen
f33d764b33 Merge "Ensure /system/vendor symlink exists in target-files-package" am: ac8b2ab702 am: 5179e70cc3
am: d54ba0b9ff

Change-Id: Iab5a3288253edeed370e58296594faa3239b0196
2017-03-23 22:06:32 +00:00
Dan Willemsen
d54ba0b9ff Merge "Ensure /system/vendor symlink exists in target-files-package" am: ac8b2ab702
am: 5179e70cc3

Change-Id: I3e834d540c4b59c1499db2bd425cce2ef39ad986
2017-03-23 22:01:33 +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
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
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
0e785c79b8 Increase max heap size for javac to 2GB.
Compiling Dialer requires increasing the javac heap size above
1GB, probably due to the extensive use of annotation processors.
Increase it to 2GB.

Test: m -j ANDROID_COMPILE_WITH_JACK=false
Change-Id: I4dd3759a98ea915469e69f563dc49be8a25d518e
2017-03-22 20:41:14 -07:00
Colin Cross
7a43b1edc3 Merge "Desugar when javac version is 1.7" am: ed44a54991 am: ce9dfdeee6
am: 937d276bed

Change-Id: I19430809cf5cf77fc4876d0ddee00bd4ddc4ff12
2017-03-23 03:02:54 +00:00
Colin Cross
937d276bed Merge "Desugar when javac version is 1.7" am: ed44a54991
am: ce9dfdeee6

Change-Id: I4cf83e8ea97a0ebdc8f25d569fd997a01a603a4d
2017-03-23 02:59:54 +00: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
e272d9c64a Merge changes I84e4f878,I37b65eb9 am: bfc4f5e339 am: f4b5c3139c
am: 92fe48a888

Change-Id: I8a653a18a012117300df711e3a4fd9faa46d32c5
2017-03-23 02:25:51 +00:00
Dan Willemsen
92fe48a888 Merge changes I84e4f878,I37b65eb9 am: bfc4f5e339
am: f4b5c3139c

Change-Id: Ica893d7c29751a29174b43f585d7f4723e46992b
2017-03-23 02:23:21 +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
TreeHugger Robot
8c51b5d09a Merge "PLATFORM_PREVIEW_SDK_VERSION should be 2 for the next Preview/Beta Release of OC" 2017-03-22 22:36:57 +00:00
Ed Tam
8fbf1d6822 Merge "Add partner vendor projects to clang exception list" 2017-03-22 19:54:02 +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
Ian Pedowitz
662f11905d PLATFORM_PREVIEW_SDK_VERSION should be 2 for the next Preview/Beta Release of OC
Test: lunch marlin-userdebug && m -j40
Change-Id: I1654ab2b63ebddc79fd41f3c9d3d9e3902f03172
Fixes: 36512249
2017-03-22 11:02:39 -07:00
TreeHugger Robot
20fe5d5d4c Merge "Set PLATFORM_VERSION for PPR1 builds to P" 2017-03-22 08:18:23 +00:00
Colin Cross
f35c03a6a5 Set PLATFORM_VERSION for PPR1 builds to P
Fixes error about missing PPR1.adb_key file.

Bug: 34972208
Test: lunch sailfish-userdebug-PPR1 && m -j
Change-Id: I82cd78376f3e238a6c4aaf27825c8d66b89d5a89
2017-03-21 23:10:44 -07:00
Dan Willemsen
ea8f68ed6c Merge "Speed up non-AB ota_from_target_files in the build system" am: 47ba4239c8 am: 02e29c5b48
am: 62fb821faf

Change-Id: Idb3a0c991efe712865db7343861212a74ea56b0a
2017-03-22 02:26:50 +00:00
Dan Willemsen
62fb821faf Merge "Speed up non-AB ota_from_target_files in the build system" am: 47ba4239c8
am: 02e29c5b48

Change-Id: Ifeea7db10217543d49bdd1cf1e657287b313521a
2017-03-22 02:25:18 +00:00
Colin Cross
7ad4cdd91f Use new naming scheme for TARGET_PLATFORM_VERSION
am: f6cf099b27

Change-Id: I8a43ab65525c72978dcfe8aee25f1022776af6a4
2017-03-22 02:24:51 +00: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
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
Colin Cross
9efe51f27a 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
Merged-In: Ib00b13abe79a744e344b88bb1d800524ab09d585
2017-03-21 23:38:02 +00:00
Dan Willemsen
aadd499bc3 Parallelize system*.img and target-files-package
We don't actually need to build the system image before
target-files-package, we just need to make sure everything is present in
$(PRODUCT_OUT)/system. So switch the dependencies around.

This can't be done as easily for the vendor image, since it may be a
prebuilt, or we may need to install some kernel modules into
$(PRODUCT_OUT)/vendor when building vendor.img. It tends to be smaller
anyway, so the time savings isn't as big.

Test: Make sure the build server outputs the same files
Test: Ensure target-files-package is identical before/after.
Change-Id: I84e4f878491ab2b71582f4f49418dbfbba75590f
2017-03-21 16:36:14 -07:00
TreeHugger Robot
50ac58a4b8 Merge "Use new naming scheme for TARGET_PLATFORM_VERSION" 2017-03-21 23:32:44 +00:00
Dan Willemsen
653bea928a Add missing dependencies of targets-files-package
And move simple cases of $(ACP) to cp. That does change OTA/bin/updater
from 0640 to 0700, but that's more consistent anyways.

Test: m -j target-files-package; ensure it's the same before/after.
Change-Id: I37b65eb9ddccd2f360aa007f929ece35c9e44f9b
2017-03-21 16:32:43 -07:00
Nan Zhang
2deac67a86 Merge "Fixed the issue that dirname: META got zipped twice." am: 8b6458e9a9 am: e22afd4998
am: b7ef9849c3

Change-Id: I6b824a1ae1eb66a98aafc8c0148b0b49006edd8a
2017-03-21 22:40:23 +00:00
Dan Willemsen
cea5cd210e Speed up non-AB ota_from_target_files in the build system
We've just created the target files package and still have the extracted
directory, so pass that to ota_from_target_files so that it doesn't have
to re-extract what we just compressed.

This saves a little bit of time -- for bullhead-userdebug on internal
master, this brings the time to build an OTA from ~340s -> ~310s. Much
of the time is still spent generating and signing the OTA.

Test: lunch bullhead-userdebug; m -j otapackage
Test: bullhead-ota-*.zip is identical before/after
Change-Id: Ib51cf6b02123e9c49280e9957c6590645470a52c
2017-03-21 15:34:27 -07:00
Nan Zhang
b7ef9849c3 Merge "Fixed the issue that dirname: META got zipped twice." am: 8b6458e9a9
am: e22afd4998

Change-Id: Ied0d73ed404185b26fa69605b81beccdd8bad6ab
2017-03-21 22:33:24 +00:00
Nan Zhang
e22afd4998 Merge "Fixed the issue that dirname: META got zipped twice."
am: 8b6458e9a9

Change-Id: Idd8eb1727778c52a8abea497477e3999c3d9706d
2017-03-21 22:24:52 +00:00
Treehugger Robot
8b6458e9a9 Merge "Fixed the issue that dirname: META got zipped twice." 2017-03-21 22:15:19 +00:00
Colin Cross
d8bc190a63 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
2017-03-21 14:39:00 -07:00
Nan Zhang
cabecd9c55 Fixed the issue that dirname: META got zipped twice.
When building target-files-package, dir: META has to be copied first
to help early validation of the .zip file.

In order to prevent $(zip_root)/META from getting copied twice to $@.list,
use the method (find -path -prune -o -print) instead of (grep pattern -v).

Test: m target-files-package
Bug: b/31676493
Change-Id: Id6b4d77fb62aa136253de88573cc51a575b90be2
2017-03-21 20:07:41 +00:00
Colin Cross
09e82eb89a Merge changes I0508b2cc,I3d6bbc36 am: 767cb900a1 am: 235e342639
am: 916de9606b

Change-Id: I824c89dc8f10912c60313023e5e1eecd610f36e3
2017-03-21 19:44:13 +00:00
Colin Cross
916de9606b Merge changes I0508b2cc,I3d6bbc36 am: 767cb900a1
am: 235e342639

Change-Id: I9ed2530dd33c231db92f6e10dcea8b2baaba123f
2017-03-21 19:40:11 +00:00
Colin Cross
235e342639 Merge changes I0508b2cc,I3d6bbc36
am: 767cb900a1

Change-Id: I72a150e3220e249b2601d27606f42f47197e9a2a
2017-03-21 19:37:14 +00:00
Ed Tam
fa8d823f7c Add partner vendor projects to clang exception list
Bug: 36402040

Test: Built partner target in aosp branch with same change
Change-Id: I23cd948606bd26d2ec96281993ec6991027ba1b7
Signed-off-by: Ed Tam <etam@google.com>
2017-03-21 12:26:44 -07:00