Commit graph

36394 commits

Author SHA1 Message Date
TreeHugger Robot
c003af00a1 Merge "Remove media config file copy rule" 2017-03-23 20:14:37 +00:00
Lingfeng Yang
450cd0ba62 Use HWC2 for all emulator images.
bug: 36375335

Change-Id: I1a220d7ea0174a87713e3009ceba22a5e3f66f25
2017-03-23 19:33:33 +00: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
Diego Wilson
f4efd73e96 Remove dependency on marlin sepolicy
Now that the selinux policy has been split between the system and
vendor partitions the aosp_arm64_ab build variant no longer
depends on the marlin selinux policy to work on marlin and sailfish.

Test: build and flash aosp_arm64_ab system.img on marlin and sailfish
Change-Id: I7681207284d783ffca1acccf44dbb159ea3b521c
2017-03-23 13:30:04 -04: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
9ff9720888 Merge "Add libaudioroute.so to aosp_arm64_ab" 2017-03-22 22:39: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
Diego Wilson
70251beb44 Add libaudioroute.so to aosp_arm64_ab
libaudioroute.so is required in the system.img
in order for audio to be functional.

Test: hear tones on dialer in marlin and sailfish
Change-Id: I477aff9d041a8c60c88e7c74aab3b6802d43724f
2017-03-22 11:12:21 -07: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
Michael Wright
32c89d462f Merge "Remove inputflinger from the builds." 2017-03-22 15:16:53 +00:00
TreeHugger Robot
20fe5d5d4c Merge "Set PLATFORM_VERSION for PPR1 builds to P" 2017-03-22 08:18:23 +00:00
Tao Bao
15d816bfc5 Merge "Add a missing default value for OPTIONS.extracted_input." am: 2c280271ac am: 3918b311f5
am: 5114910040

Change-Id: Ia52560941ffe86d08ffeb20728e6aea6afff583d
2017-03-22 07:43:10 +00:00
Tao Bao
5114910040 Merge "Add a missing default value for OPTIONS.extracted_input." am: 2c280271ac
am: 3918b311f5

Change-Id: Ic7759c21e07806f3b87757c0f6e012ebf2e08c2d
2017-03-22 07:41:11 +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
TreeHugger Robot
76c194e2a3 Merge "Change mediacodec to android.hardware.media.omx@1.0-service" 2017-03-22 06:15:40 +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
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
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
Colin Cross
991f947956 Merge "Use new naming scheme for TARGET_PLATFORM_VERSION" am: 53d66b5903 -s ours am: 8a378154dd
am: 6b7e8efbfc  -s ours

Change-Id: Ie6f83be45b1fd266d1f358122875d1ad08151418
2017-03-22 02:26:36 +00:00
Colin Cross
737c778b57 Use new naming scheme for TARGET_PLATFORM_VERSION am: f6cf099b27
am: 7ad4cdd91f

Change-Id: Iaea0ce4e8ec509c3104a188916985ed9a8db77e0
2017-03-22 02:26:20 +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
6b7e8efbfc Merge "Use new naming scheme for TARGET_PLATFORM_VERSION" am: 53d66b5903 -s ours
am: 8a378154dd

Change-Id: I4de0a3e05a7e367b5cfb847e14f26078d75e71d0
2017-03-22 02:25:05 +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
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
Jiyong Park
3e213c849b Add wifi support to the generic system image
Added wifi-related packages (except those not generic such as
wpa_supplicant) to the generic system image.

Bug: 36015569
Test: Wifi works with this generic image on sailfish.

Change-Id: Ib4d07facd4eb1ca0f375d9135a75b892d0ef80a4
2017-03-22 02:20:34 +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
58f8dfa5a6 Merge "removed "android.hardware.configstore@1.0-impl" from PRODUCT_PACKAGES" am: 946af3fa5d am: 3973c2af63
am: 9c41aa58eb

Change-Id: Ic2a10e7fe09eec97680619779b65fb36ede00758
2017-03-22 01:07:50 +00:00
Jaesoo Lee
9c41aa58eb Merge "removed "android.hardware.configstore@1.0-impl" from PRODUCT_PACKAGES" am: 946af3fa5d
am: 3973c2af63

Change-Id: I40ffaa6591ec51ee792baa2d1ec291a718df0c71
2017-03-22 01:05:57 +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
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