Commit Graph

36423 Commits

Author SHA1 Message Date
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
TreeHugger Robot
d4bcd158a5 Merge "Use HWC2 for all emulator images." 2017-03-24 21:03:37 +00:00
Christopher Ferris
36a570f7e0 Merge "Small fixes for environment variables." am: fd0cb496b1 am: 37f3a728a0
am: 7eb7796868

Change-Id: Iafed66e19bc114552b0261dd299379dbb37873c6
2017-03-24 16:23:45 +00:00
Christopher Ferris
7eb7796868 Merge "Small fixes for environment variables." am: fd0cb496b1
am: 37f3a728a0

Change-Id: I33108c466515a322652104e41ee5787f95f1060d
2017-03-24 16:21:43 +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
Jiyong Park
06241051e8 Make telephony work on generic system image
Bug: 36070427
Test: modem is up and emergency call can be made
Change-Id: Ic09200943a7ae7c51e420c6485f3b1b95c702265
2017-03-24 08:47:47 +00:00
TreeHugger Robot
e496c6a76f Merge "Add libion to the generic sytem image for camera" 2017-03-24 07:56:57 +00:00
TreeHugger Robot
75187d0d8e Merge "Add wifi support to the generic system image" 2017-03-24 07:51:34 +00:00
Dan Willemsen
bf9edaafc0 Merge "Depend on (bs|img)diff for target-files-package" am: 90151623fc am: e9e4001b34
am: 29651c25fa

Change-Id: If1f601510b7a33936c73d371a676bbcc509089f7
2017-03-24 07:33:13 +00:00
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
90151623fc Merge "Depend on (bs|img)diff for target-files-package" 2017-03-24 07:24:36 +00:00
Jiyong Park
a14bf425f7 Add libion to the generic sytem image for camera
Camera HAL is using libion. I believe libion is generic library, so put
it in this generic system image.

Bug: 36043196
Test: make, flash and check that libion.so is in /system/lib.
Change-Id: I2e6b68e5899e27c603476ad7c5cd64f3cd5a8c53
2017-03-24 06:29:02 +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
TreeHugger Robot
74922e8dfb Merge "Remove dependency on marlin sepolicy" 2017-03-23 22:30: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
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
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