Commit Graph

9724 Commits

Author SHA1 Message Date
Yohann Roussel
fd8bdb4f3b Fix jack min sdk version for ub branches
am: d6101b6

* commit 'd6101b678688bce96d67f8d945537f405f648194':
  Fix jack min sdk version for ub branches
2016-03-16 16:45:11 +00:00
Yohann Roussel
26912851ab resolve merge conflicts of 63de777 to nyc-dev-plus-aosp
Change-Id: I5dadd6f7bbf494665f9deb0cfafcce65530825d0
2016-03-16 17:33:38 +01:00
Yohann Roussel
d6101b6786 Fix jack min sdk version for ub branches
Bug: 27371864
Change-Id: Idd926f5667fbe4275f8f1d80733b8c4471570874
2016-03-16 17:20:20 +01:00
Yohann Roussel
63de777488 Merge "Inform Jack of the min sdk" into nyc-dev 2016-03-16 15:41:58 +00:00
Yohann Roussel
740ec8fe8a Inform Jack of the min sdk
Set Jack min sdk according to LOCAL_SDK_VERSION. Gives Jack current
version when LOCAL_SDK_VERSION is not available.

Bug: 27371864

(cherry picked from commit c6383d6ec6)

Change-Id: Ieba0219494f29d2737d2ca234317c3af7e5e72c8
2016-03-16 15:41:00 +01:00
Sen Jiang
8d754a5e0b Merge "Revert "Add zlib_fingerprint to target_files.zip""
am: d2ca52d

* commit 'd2ca52df8c7ac08c3191118fa8606816d20ac119':
  Revert "Add zlib_fingerprint to target_files.zip"
2016-03-16 04:12:44 +00:00
Sen Jiang
d2ca52df8c Merge "Revert "Add zlib_fingerprint to target_files.zip"" 2016-03-16 04:04:41 +00:00
Sen Jiang
040141becb Revert "Add zlib_fingerprint to target_files.zip"
This reverts commit d8c715bf34.

Change-Id: Ie0c3c5b2db89fe076d678b67f013c20e836d825f
2016-03-16 03:38:29 +00:00
Sen Jiang
e55b1ffa8c Merge "Add zlib_fingerprint to target_files.zip"
am: 65aa976

* commit '65aa9761539736e4ab5622d0cff5d8160cc620f8':
  Add zlib_fingerprint to target_files.zip
2016-03-16 03:06:32 +00:00
Sen Jiang
65aa976153 Merge "Add zlib_fingerprint to target_files.zip" 2016-03-16 02:59:36 +00:00
Ying Wang
8d7e09cee1 Fix error introduced in merge commit c9a19779a2.
Change-Id: I0f49519f4c9dd16052e85a7b820e1ed8f4300380
2016-03-15 16:58:51 -07:00
Shinichiro Hamaji
082d5e5081 Merge "Replace last -includes by .KATI_DEPFILE"
am: c26ec724b8

* commit 'c26ec724b8b4d356573901f96e1a8ce728bdd1b1':
  Replace last -includes by .KATI_DEPFILE
2016-03-15 23:06:31 +00:00
Ying Wang
c9a19779a2 resolve merge conflicts of fc16dca602 to nyc-dev-plus-aosp
Now we can remove all uses of $(ACP) in prebuilt_internal.mk.

Change-Id: I07a449f3acca9b56c6a387ff8ca1535d19c872d1
2016-03-15 14:46:12 -07:00
Shinichiro Hamaji
72904774a3 Replace last -includes by .KATI_DEPFILE
There was a typo in binary.mk. compile-dotdot-XXX-file in
definitions.mk was also using -include.

Bug: 26839129
Change-Id: I4a0145fb70413998cc65d30d2efcd68af07b4800
2016-03-16 06:40:04 +09:00
Ying Wang
fc16dca602 Merge "Rebuild odex files in PDK fusion build." into nyc-dev 2016-03-15 21:23:50 +00:00
Ying Wang
3912b35cfc Merge "Fix warning of "overriding commands for target ...boot.oat"." into nyc-dev
am: 234985a127

* commit '234985a1273060f00d11241e4d9e107ba900fdb3':
  Fix warning of "overriding commands for target ...boot.oat".
2016-03-15 21:13:48 +00:00
Ying Wang
234985a127 Merge "Fix warning of "overriding commands for target ...boot.oat"." into nyc-dev 2016-03-15 20:59:25 +00:00
Ying Wang
222ebac10c Fix warning of "overriding commands for target ...boot.oat".
There seems to be bug in Kati that when we write it as:
LIBART_TARGET_BOOT_ART_EXTRA_FILES += boot.oat $(patsubst
%.art,%.oat,$(LIBART_TARGET_BOOT_ART_EXTRA_FILES))

boot.oat ends up in the value twice.
This works around the bug, filed as bug/27676615.

Bug: 27546601
Change-Id: Ifc330280496083a4c817e53bc5c77c86e48a2426
2016-03-15 12:26:55 -07:00
Sami Tolvanen
a8c37be285 Revert "Revert "build: pass version and patch level to mkbootimg""
This reverts commit 494a9090f9.

Bug: 27498078
Bug: 22914603
Change-Id: Iee6a784271ec32c6bfcc0a6ad3f0395d82016df3
(cherry picked from commit 3303d909a1)
2016-03-15 11:23:56 -07:00
Sami Tolvanen
4abe19c584 Merge "Revert "Revert "build: pass version and patch level to mkbootimg"""
am: b1e99acb00

* commit 'b1e99acb00818c0dc244a4203106177eb28ca66b':
  Revert "Revert "build: pass version and patch level to mkbootimg""
2016-03-15 17:47:08 +00:00
Sami Tolvanen
b1e99acb00 Merge "Revert "Revert "build: pass version and patch level to mkbootimg""" 2016-03-15 17:37:27 +00:00
Sami Tolvanen
3303d909a1 Revert "Revert "build: pass version and patch level to mkbootimg""
This reverts commit 494a9090f9.

Bug: 27498078
Bug: 22914603
Change-Id: Iee6a784271ec32c6bfcc0a6ad3f0395d82016df3
2016-03-15 16:49:30 +00:00
Yohann Roussel
a023f41f13 Merge "Revert "Inform Jack of the min sdk"" 2016-03-15 15:04:54 +00:00
Yohann Roussel
962282bde2 Revert "Inform Jack of the min sdk"
This reverts commit 94451580af.

Bug: 27371864
Change-Id: I60a8c89b2ab8a6cbde4dd3b0aed24b71700815ab
2016-03-15 15:02:11 +00:00
Yohann Roussel
b5ea85a903 Revert "Remove one debug line"
This reverts commit d2fafe5734.

Change-Id: I8915604faafb21cf15c0f11ee8a770be2cfc9614
2016-03-15 14:51:28 +00:00
Yohann Roussel
d2fafe5734 Remove one debug line
Change-Id: I6de104dd2ca42404d45f3f4b91ccadd03d391f1c
2016-03-15 11:06:51 +01:00
Yohann Roussel
10baeeebc4 Merge "Inform Jack of the min sdk" 2016-03-15 09:42:11 +00:00
Ying Wang
3a61eeb6cb Rebuild odex files in PDK fusion build.
To rebuild odex files of Java libraries and apps,
we store the jars/apks without stripping the classes.dex inside the
platform.zip. We also save the build variables that may affect how we
rebuild an odex in pdk_dexpreopt_config.mk in the platform.zip.
We store the files and configuration only for libraries/apps that get
installed to the system.img (or vendor.img).

In PDK fusion build, we auto-generate prebuilt module definitions for
the javalib.jar and package.dex.apk carried in the platform.zip, using
configuration stored in pdk_dexpreopt_config.mk.
With the prebult modules, we override the implicit rule that directly
copies the odex from the platform.zip.
To rebuild odex of javalib.jar, we added support for prebuilt shared Java
library to prebiult_internal.mk. An installable prebuilt Java library is
treated as shared Java library, i.e. with classes.dex in the jar instead
of a set of .class files.
For apks in the platform.zip, we install the stripped version from
platform files inside platform.zip, instead of the package.dex.apk,
using a new variable LOCAL_REPLACE_PREBUILT_APK_INSTALLED. We can't
strip package.dex.apk because we can't re-sign the stripped apk at this
point.

We generate prebuilt module only if it's not already defined in the
source tree.

Bug: 27543283
Change-Id: I9e146f8b713d6f57c397fd28d88c9ab700757ca1
2016-03-14 21:01:46 -07:00
Shinichiro Hamaji
fb87a2610d Merge "Use KATI_DEPFILE for .P associated with object files"
am: b95dc31033

* commit 'b95dc310330bd59fa860ab98822529bb0d2256c6':
  Use KATI_DEPFILE for .P associated with object files
2016-03-14 22:07:10 +00:00
Shinichiro Hamaji
b95dc31033 Merge "Use KATI_DEPFILE for .P associated with object files" 2016-03-14 21:59:46 +00:00
Dan Willemsen
4dbb80dae5 Merge "Handle out being a symlink"
am: 0314519bf4

* commit '0314519bf4e09d57bfe12f106a7a0fb8d63664d2':
  Handle out being a symlink
2016-03-14 19:39:26 +00:00
Dan Willemsen
0314519bf4 Merge "Handle out being a symlink" 2016-03-14 19:35:43 +00:00
Sami Tolvanen
b3038bedcd Merge "Revert "build: pass version and patch level to mkbootimg"" into nyc-dev 2016-03-14 15:49:15 +00:00
Sami Tolvanen
1bca9fb6d4 Revert "build: pass version and patch level to mkbootimg"
This reverts commit e555f77962.

Bug: 27580174
Change-Id: I0fd1ddb64d2fd4f91b0ecbc1ab8953a1324a10eb
2016-03-14 15:47:11 +00:00
Neil Fuller
0e8ec505f6 Make the language version selection smarter
Any artifacts that are targeting SDK versions < 24
and not explicitly setting the LOCAL_JAVA_LANGUAGE_VERSION
are now defaulted to 1.7.

Bug: 27495650
Bug: 26753820
Bug: 27377071
(cherry-picked from commit decb797276)

Change-Id: I0734b6e690bea32def3dc435c9ce0bd90b845e79
2016-03-14 11:40:01 +00:00
Ian Pedowitz
fbd458534d PLATFORM_PREVIEW_SDK_VERSION = 2 for DP2
am: e5df61318e

* commit 'e5df61318e43302c0dade438aa8ede285e5039cc':
  PLATFORM_PREVIEW_SDK_VERSION = 2 for DP2
2016-03-12 18:23:36 +00:00
Ian Pedowitz
e5df61318e PLATFORM_PREVIEW_SDK_VERSION = 2 for DP2
Bug: 27150977
Change-Id: I8b86b5565dbdf81dffb4bc9ba0eef8a3c3f91d20
2016-03-11 22:13:36 -08:00
Dan Willemsen
d53c0c7b45 Handle out being a symlink
Soong needs to be able to reverse the relative path to out. Switch to
absolute paths if .. won't work because of out being a symlink to
somewhere else.

Bug: 27612837
Change-Id: Ib8b9e0f80523148cfd4b69a03d164578916d8fd5
2016-03-11 16:29:23 -08:00
Stephen Hines
efd50b725b Switch to clang-2658975.
Bug: http://b/27482631

This fixes an issue where krait compiles were not passing the proper
flags to the assembler when -no-integrated-as is used. This was
preventing ART from switching to clang in some cases.

(cherry picked from commit c503d8ef58)

Change-Id: I4a0efb78f37fee73bf61841f0347328b8f61c192
2016-03-11 15:03:18 -08:00
Andreas Gampe
63e5a86844 Merge changes I4a2692f3,Ifd8d3a2c into nyc-dev
am: 6f0a902081

* commit '6f0a9020815bb3da5bf43fcd74bddb7ffe1e239f':
  Build: Only preopt boot images in eng builds
  Revert "Don't preopt on eng builds."
2016-03-11 16:24:48 +00:00
Andreas Gampe
6f0a902081 Merge changes I4a2692f3,Ifd8d3a2c into nyc-dev
* changes:
  Build: Only preopt boot images in eng builds
  Revert "Don't preopt on eng builds."
2016-03-11 16:20:51 +00:00
Yohann Roussel
94451580af Inform Jack of the min sdk
Set Jack min sdk according to LOCAL_SDK_VERSION. Gives Jack current
version when LOCAL_SDK_VERSION is not available.

Bug: 27371864
Change-Id: Ieba0219494f29d2737d2ca234317c3af7e5e72c8
2016-03-11 11:55:57 +01:00
Sami Tolvanen
478eb605b7 Merge "Revert "build: pass version and patch level to mkbootimg""
am: 926096eff6

* commit '926096eff685265912f3050bb43715cfa36df0aa':
  Revert "build: pass version and patch level to mkbootimg"
2016-03-11 00:24:23 +00:00
Sami Tolvanen
926096eff6 Merge "Revert "build: pass version and patch level to mkbootimg"" 2016-03-11 00:11:25 +00:00
Sami Tolvanen
494a9090f9 Revert "build: pass version and patch level to mkbootimg"
This reverts commit 8fb47f191f.

Bug: 27580174
Change-Id: Id87fd1e8da217438757d5a0fa4bbef7aea6770fc
2016-03-11 00:08:57 +00:00
Andreas Gampe
4df565786a Build: Only preopt boot images in eng builds
As a middle way between full preopt/high performance/long builds,
and no preopt/low performance/fast turnaround, preopt only the
boot image in eng builds.

Bug: 26794212
Change-Id: I4a2692f3ce84823cd40c6b7d672fd73257739ef8
2016-03-10 15:34:46 -08:00
Andreas Gampe
6c6c51aa79 Revert "Don't preopt on eng builds."
This reverts commit 7effde0048.

Bug: 25801231
Bug: 26794212
2016-03-10 15:07:27 -08:00
Stephen Hines
e670009fc3 Merge "Switch to clang-2658975."
am: bda10679be

* commit 'bda10679bed78e501592d26a0df96094b2fba4fa':
  Switch to clang-2658975.
2016-03-10 22:53:28 +00:00
Stephen Hines
bda10679be Merge "Switch to clang-2658975." 2016-03-10 22:46:01 +00:00
Ying Wang
6b7497ad1a Add dependency on boot_singer and vboot_singer if necessary.
am: bd07ad01b5

* commit 'bd07ad01b554694f1d3b290fb066033866ededc4':
  Add dependency on boot_singer and vboot_singer if necessary.
2016-03-10 22:18:25 +00:00