p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
28,422 Commits 1 Branch 0 Tags 68 MiB
Commit Graph

28422 Commits

Author SHA1 Message Date
Ying Wang da36635df6 Fix error introduced in merge commit c9a19779a2. 
Change-Id: Idae48cdba90af40b8369f6f3a49c012b3bb2970a
 2016-03-15 17:05:52 -07:00
Ying Wang 09c306c705 Revert "Revert "resolve merge conflicts of fc16dca602 to nyc-dev-plus-aosp"" 
This reverts commit b7d33c0739.
 2016-03-15 16:36:29 -07:00
Ying Wang b7d33c0739 Revert "resolve merge conflicts of fc16dca602 to nyc-dev-plus-aosp" 
This reverts commit c9a19779a2, reversing
changes made to 3912b35cfc.
 2016-03-15 16:28:57 -07:00
Shinichiro Hamaji 55fad07057 Merge "Replace last -includes by .KATI_DEPFILE" am: c26ec724b8 
am: 082d5e5081

* commit '082d5e5081732c6c4d42069b2f3fd560dcce768d':
  Replace last -includes by .KATI_DEPFILE
 2016-03-15 23:08:50 +00: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
Shinichiro Hamaji c26ec724b8 Merge "Replace last -includes by .KATI_DEPFILE" 2016-03-15 23:00:11 +00:00
Ying Wang 267425b630 resolve merge conflicts of fc16dca602 to nyc-dev-plus-aosp 
am: c9a19779a2

* commit 'c9a19779a219bd9e4dd162d30249be7d22020c67':
  Rebuild odex files in PDK fusion build.
 2016-03-15 21:52:28 +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 af6f995774 Merge "Fix warning of "overriding commands for target ...boot.oat"." into nyc-dev am: 234985a127 
am: 3912b35cfc

* commit '3912b35cfcb1896a0625164bf2163e7a6145ed8d':
  Fix warning of "overriding commands for target ...boot.oat".
 2016-03-15 21:17:46 +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
Sami Tolvanen ac1c3ddb77 Revert "Revert "build: pass version and patch level to mkbootimg"" am: a8c37be285 
am: 6fb9b81946

* commit '6fb9b81946e47f65a18e437b98ad9aa7844eeb35':
  Revert "Revert "build: pass version and patch level to mkbootimg""
 2016-03-15 19:34:01 +00:00
Sami Tolvanen 6fb9b81946 Revert "Revert "build: pass version and patch level to mkbootimg"" 
am: a8c37be285

* commit 'a8c37be28598c6bdd920af4c306a29db013b68e7':
  Revert "Revert "build: pass version and patch level to mkbootimg""
 2016-03-15 19:31:27 +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
Tao Bao 03aa1dfd3e Merge "Revert "releasetools: Support OTAs that have OEM properties changes."" am: 3c37889299 
am: a1dc633a7f

* commit 'a1dc633a7fab05ae3a67d29acf76519f9723bbfb':
  Revert "releasetools: Support OTAs that have OEM properties changes."
 2016-03-15 19:26:39 +00:00
Tao Bao a1dc633a7f Merge "Revert "releasetools: Support OTAs that have OEM properties changes."" 
am: 3c37889299

* commit '3c37889299b7ab8df676fed7b8157484a7e5315a':
  Revert "releasetools: Support OTAs that have OEM properties changes."
 2016-03-15 19:24:21 +00:00
Tao Bao 3c37889299 Merge "Revert "releasetools: Support OTAs that have OEM properties changes."" 2016-03-15 19:16:33 +00:00
Tao Bao 838c68fa1a Revert "releasetools: Support OTAs that have OEM properties changes." 
Broke some builds.

This reverts commit c086370440.

Change-Id: If07006db412fea6c04f8698776a2ab418125a469
 2016-03-15 19:16:18 +00:00
Tao Bao 2a907b59b7 Merge "releasetools: Support OTAs that have OEM properties changes." am: 61cebe79f4 
am: 122f8823be

* commit '122f8823bec8fbdbaaff235ab9c685467d8ca087':
  releasetools: Support OTAs that have OEM properties changes.
 2016-03-15 18:45:21 +00:00
Tao Bao 122f8823be Merge "releasetools: Support OTAs that have OEM properties changes." 
am: 61cebe79f4

* commit '61cebe79f4949217181431fb347b7577d74ecc75':
  releasetools: Support OTAs that have OEM properties changes.
 2016-03-15 18:43:03 +00:00
Tao Bao 61cebe79f4 Merge "releasetools: Support OTAs that have OEM properties changes." 2016-03-15 18:33:20 +00: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 7b9bd23f6d Merge "Revert "Revert "build: pass version and patch level to mkbootimg""" am: b1e99acb00 
am: 4abe19c584

* commit '4abe19c584e0bc2935a953befe21249af3718b67':
  Revert "Revert "build: pass version and patch level to mkbootimg""
 2016-03-15 17:51:48 +00: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 24bb46ec66 Merge "Revert "Inform Jack of the min sdk"" am: a023f41f13 -s ours 
am: 1f860a419a

* commit '1f860a419a15abc2deb5771147a0a7a05fa22ca9':
  Revert "Inform Jack of the min sdk"
 2016-03-15 15:45:56 +00:00
Yohann Roussel b66f4c2980 Merge "Revert "Remove one debug line"" am: 5bfe8e0265 -s ours 
am: 46325a51d2

* commit '46325a51d23e0a0a8adc0f1d199f54537c0b45af':
  Revert "Remove one debug line"
 2016-03-15 15:45:56 +00:00
Yohann Roussel 1f860a419a Merge "Revert "Inform Jack of the min sdk"" 
am: a023f41f13  -s ours

* commit 'a023f41f13e0c23200b150699ed378f1400c6132':
  Revert "Inform Jack of the min sdk"
 2016-03-15 15:45:41 +00:00
Yohann Roussel 46325a51d2 Merge "Revert "Remove one debug line"" 
am: 5bfe8e0265  -s ours

* commit '5bfe8e026534b365e4591b1020e89216b6c35149':
  Revert "Remove one debug line"
 2016-03-15 15:43:24 +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 5bfe8e0265 Merge "Revert "Remove one debug line"" 2016-03-15 15:01:31 +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 f489dd9698 Merge "Remove one debug line" am: 087ea0eca1 -s ours 
am: 996ae29495

* commit '996ae29495e6d4dd9bced1c32f52ae21dace69cd':
  Remove one debug line
 2016-03-15 14:22:54 +00:00
Yohann Roussel 996ae29495 Merge "Remove one debug line" 
am: 087ea0eca1  -s ours

* commit '087ea0eca1411fb4ae1ae7d86a5988a8936749cb':
  Remove one debug line
 2016-03-15 14:20:40 +00:00
Yohann Roussel 087ea0eca1 Merge "Remove one debug line" 2016-03-15 13:52:46 +00:00
Yohann Roussel d2fafe5734 Remove one debug line 
Change-Id: I6de104dd2ca42404d45f3f4b91ccadd03d391f1c
 2016-03-15 11:06:51 +01:00
Yohann Roussel b790080a11 Merge "Inform Jack of the min sdk" am: 10baeeebc4 -s ours 
am: e3233ccb03

* commit 'e3233ccb03fb8859228a009c9ac7a47bdfd4cd08':
  Inform Jack of the min sdk
 2016-03-15 09:57:34 +00:00
Yohann Roussel e3233ccb03 Merge "Inform Jack of the min sdk" 
am: 10baeeebc4  -s ours

* commit '10baeeebc449d7db7ecae7f153955e796604c798':
  Inform Jack of the min sdk
 2016-03-15 09:54:38 +00: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
Alex Klyubin f62ab609fc Fix two cosmetic issues in signapk. am: 914b37f4e3 
am: 2bdd6ed2fd

* commit '2bdd6ed2fda17b2a8c19f35e99b6a93a9e5edfe9':
  Fix two cosmetic issues in signapk.
 2016-03-14 23:49:34 +00:00
Alex Klyubin 2bdd6ed2fd Fix two cosmetic issues in signapk. 
am: 914b37f4e3

* commit '914b37f4e3430606ec9850f05c51fb112279484b':
  Fix two cosmetic issues in signapk.
 2016-03-14 23:47:23 +00:00
Alex Klyubin 914b37f4e3 Fix two cosmetic issues in signapk. 
* Zip EoCD record comment length was referred to as 32-bit whereas it
  is a 16-bit field. The implementation was fine, but the comment and
  the naming of a constant were wrong.
* System.out.println was left over from early prototyping days.
  Removed.

Bug: 25794543

(cherry picked from commit 82bf99bb4e)

Change-Id: I9845b5fa096859d67b306f4b9b6c205cad622c0c
 2016-03-14 15:13:30 -07:00
Shinichiro Hamaji 7e0d7c9355 Merge "Use KATI_DEPFILE for .P associated with object files" am: b95dc31033 
am: fb87a2610d

* commit 'fb87a2610d6035801692d885e71a6c9af2109603':
  Use KATI_DEPFILE for .P associated with object files
 2016-03-14 22:08:57 +00: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