openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity
26,008 Commits 2 Branches 1 Tag 73 MiB
Commit Graph

26008 Commits

Author SHA1 Message Date
Tao Bao 94792ca281 Merge "releasetools: Allow logging the diff for incrementals." am: 6d6e0481fa 
am: e88245ddf0

* commit 'e88245ddf0a4920ff90866b9d66b2a3e4bd89f18':
  releasetools: Allow logging the diff for incrementals.
 2015-11-30 20:18:45 +00:00
Tao Bao e88245ddf0 Merge "releasetools: Allow logging the diff for incrementals." 
am: 6d6e0481fa

* commit '6d6e0481fa86cb552e1b386e5449fe1fde2325cf':
  releasetools: Allow logging the diff for incrementals.
 2015-11-30 20:15:39 +00:00
Tao Bao 6d6e0481fa Merge "releasetools: Allow logging the diff for incrementals." 2015-11-30 20:09:39 +00:00
Tao Bao d62c603573 releasetools: Allow logging the diff for incrementals. 
Add an option "--log_diff <filename>" to ota_from_target_files.py
script. When enabled, it logs the differences between the source
and target builds into <filename> when generating incremental OTAs.

Also move target_files_diff.py into releasetools/ so that it can be
packed into otatools.zip.

Bug: 25372309
Change-Id: Ifd4ed0f2f12ef040ee377621ec8c35a873cec34f
 2015-11-30 11:26:40 -08:00
Shinichiro Hamaji 371b8c7f77 Merge "Revert "Use .KATI_RESTAT to reduce unnecessary rebuilds of .jar files"" am: 2ff3ad9045 
am: 51ef51c4ad

* commit '51ef51c4ad283198d5fb4a2ec9caecdc7a677838':
  Revert "Use .KATI_RESTAT to reduce unnecessary rebuilds of .jar files"
 2015-11-27 04:05:01 +00:00
Shinichiro Hamaji 15bead2c59 Merge "Revert "Build ijar for apps build"" am: d17c3a57f6 
am: c3725c256b

* commit 'c3725c256b5d786007f2565324324b386287725a':
  Revert "Build ijar for apps build"
 2015-11-27 04:04:53 +00:00
Shinichiro Hamaji 51ef51c4ad Merge "Revert "Use .KATI_RESTAT to reduce unnecessary rebuilds of .jar files"" 
am: 2ff3ad9045

* commit '2ff3ad90455e868a1805d065f0aa2b8babbc6660':
  Revert "Use .KATI_RESTAT to reduce unnecessary rebuilds of .jar files"
 2015-11-27 04:02:09 +00:00
Shinichiro Hamaji c3725c256b Merge "Revert "Build ijar for apps build"" 
am: d17c3a57f6

* commit 'd17c3a57f6f183b97cc557e10e221b4dc1acf47f':
  Revert "Build ijar for apps build"
 2015-11-27 04:02:01 +00:00
Shinichiro Hamaji 2ff3ad9045 Merge "Revert "Use .KATI_RESTAT to reduce unnecessary rebuilds of .jar files"" 2015-11-27 03:59:30 +00:00
Shinichiro Hamaji d17c3a57f6 Merge "Revert "Build ijar for apps build"" 2015-11-27 03:59:18 +00:00
Shinichiro Hamaji 3ae7f66bab Revert "Use .KATI_RESTAT to reduce unnecessary rebuilds of .jar files" 
This reverts commit c1f5d9c203.

Change-Id: I7e9969a060e3f1380154da65e76134168aee15d8
 2015-11-27 03:58:51 +00:00
Shinichiro Hamaji ea2da50e17 Revert "Build ijar for apps build" 
This reverts commit 9084705744.

Change-Id: I8a9958788c51dcec5028ef396cb67abd541ce31f
 2015-11-27 03:57:17 +00:00
Colin Cross 06c44241da Merge "Revert "Use libstdc++ for ijar"" am: 41dca40376 
am: 6cd88d7514

* commit '6cd88d75147217bc42fed67b558f9e4c836a20a0':
  Revert "Use libstdc++ for ijar"
 2015-11-26 22:25:12 +00:00
Colin Cross 6cd88d7514 Merge "Revert "Use libstdc++ for ijar"" 
am: 41dca40376

* commit '41dca403766d22373ba469d99ba1625d0930d02e':
  Revert "Use libstdc++ for ijar"
 2015-11-26 22:23:02 +00:00
Colin Cross 41dca40376 Merge "Revert "Use libstdc++ for ijar"" 2015-11-26 22:20:38 +00:00
Colin Cross 39cca23d41 Revert "Use libstdc++ for ijar" 
This reverts commit 718bab6aec.

Change-Id: I9aa222fc2936d7d89ae0700eeef505c6b317d777
 2015-11-26 22:20:22 +00:00
Colin Cross 8713fde1c3 Merge "Use libstdc++ for ijar" am: c97b5272d7 
am: 4c1944083f

* commit '4c1944083f03e1ddf55f16f815b89a337ffc60f6':
  Use libstdc++ for ijar
 2015-11-26 22:14:40 +00:00
Colin Cross 4c1944083f Merge "Use libstdc++ for ijar" 
am: c97b5272d7

* commit 'c97b5272d715ab9f4ff52748bd2f403235f94426':
  Use libstdc++ for ijar
 2015-11-26 22:12:38 +00:00
Colin Cross c97b5272d7 Merge "Use libstdc++ for ijar" 2015-11-26 22:10:31 +00:00
Colin Cross 718bab6aec Use libstdc++ for ijar 
For some reason ijar won't build against libc++ for TARGET_BUILD_APPS
builds, but does build with libstdc++.

Change-Id: I8e900b0f764f0bb8f827705cb9173f07e4f33862
 2015-11-26 14:09:50 -08:00
Colin Cross 93e138b723 Merge "Build ijar for apps build" am: ec4db56e58 
am: 3b5dbebe8d

* commit '3b5dbebe8d9a8beac49a8c16605df6afbec4de72':
  Build ijar for apps build
 2015-11-26 17:38:34 +00:00
Colin Cross 3b5dbebe8d Merge "Build ijar for apps build" 
am: ec4db56e58

* commit 'ec4db56e5802171bc2d0237f496e97ec093f0be0':
  Build ijar for apps build
 2015-11-26 17:36:29 +00:00
Colin Cross ec4db56e58 Merge "Build ijar for apps build" 2015-11-26 17:34:50 +00:00
Paul Duffin fb4a7cf865 Merge "Fix generated-sources-dir-for for COMMON" am: 623799d3e0 
am: 9c4bb4c1c0

* commit '9c4bb4c1c079db6c6c87f30ea861d9bec1ee1df8':
  Fix generated-sources-dir-for for COMMON
 2015-11-26 11:46:29 +00:00
Paul Duffin 9c4bb4c1c0 Merge "Fix generated-sources-dir-for for COMMON" 
am: 623799d3e0

* commit '623799d3e0aab49b00552fb7862f2528b845bd51':
  Fix generated-sources-dir-for for COMMON
 2015-11-26 11:43:02 +00:00
Paul Duffin 623799d3e0 Merge "Fix generated-sources-dir-for for COMMON" 2015-11-26 11:39:30 +00:00
Shinichiro Hamaji 9084705744 Build ijar for apps build 
This fixes git_master-linux-apps build.

Change-Id: I1a77b2495d98d89f570cb165d7f25f617c9af9aa
 2015-11-26 17:24:40 +09:00
Shinichiro Hamaji b42da32564 Merge "Use .KATI_RESTAT to reduce unnecessary rebuilds of .jar files" am: c9a1b27845 
am: 27770abe27

* commit '27770abe272eb54de5eea5fa94342c1393b681a0':
  Use .KATI_RESTAT to reduce unnecessary rebuilds of .jar files
 2015-11-26 05:33:54 +00:00
Shinichiro Hamaji 27770abe27 Merge "Use .KATI_RESTAT to reduce unnecessary rebuilds of .jar files" 
am: c9a1b27845

* commit 'c9a1b278458eddd3065c0e9fc06e12b2cb1c38cb':
  Use .KATI_RESTAT to reduce unnecessary rebuilds of .jar files
 2015-11-26 05:30:54 +00:00
Shinichiro Hamaji c9a1b27845 Merge "Use .KATI_RESTAT to reduce unnecessary rebuilds of .jar files" 2015-11-26 05:25:58 +00:00
Paul Duffin 699a32217a Fix generated-sources-dir-for for COMMON 
When the 4th argument specified is non-empty then it attempts to
use either HOST_OUT_GEN_COMMON or TARGET_OUT_GEN_COMMON
depending on whether the 3rd argument is non-empty or not
respectively. Unfortunately, those two variables do not exist,
the correct names for those variables is HOST_OUT_COMMON_GEN and
TARGET_OUT_COMMON_GET.

Change-Id: I66edb02824c06e0f504ebe04ff80ddbd77a16c95
 2015-11-25 13:14:23 +00:00
Tao Bao fe1373e194 Merge "target_files_diff: Allow writing outputs to file." am: 7b5eddd52b 
am: acd1b8e160

* commit 'acd1b8e160c8114bd07be2175388f7dcefe09687':
  target_files_diff: Allow writing outputs to file.
 2015-11-25 00:06:08 +00:00
Tao Bao acd1b8e160 Merge "target_files_diff: Allow writing outputs to file." 
am: 7b5eddd52b

* commit '7b5eddd52bfb70485488458a115a33f1af92759a':
  target_files_diff: Allow writing outputs to file.
 2015-11-25 00:03:01 +00:00
Tao Bao 7b5eddd52b Merge "target_files_diff: Allow writing outputs to file." 2015-11-24 23:57:44 +00:00
Tao Bao 5dd9a2ce11 target_files_diff: Allow writing outputs to file. 
Also clean up some pylint warnings.

Bug: 25372309
Change-Id: I226bfd72cb1310ba77352f8d367803e815e1cfa3
 2015-11-24 15:23:20 -08:00
Vince Harron 6fe5ec0db2 Shorten TARGET_BRAND from generic_<arch> to Android am: 5806531f92 am: e13b13c7f6 
am: aba12deedb

* commit 'aba12deedb9cdcf8ef01952de1cc51057d8d2bf7':
  Shorten TARGET_BRAND from generic_<arch> to Android
 2015-11-24 22:57:53 +00:00
Vince Harron aba12deedb Shorten TARGET_BRAND from generic_<arch> to Android am: 5806531f92 
am: e13b13c7f6

* commit 'e13b13c7f67b80a7e99147d76ce307d6bb5296db':
  Shorten TARGET_BRAND from generic_<arch> to Android
 2015-11-24 22:54:42 +00:00
Vince Harron e13b13c7f6 Shorten TARGET_BRAND from generic_<arch> to Android 
am: 5806531f92

* commit '5806531f92a3670362ec8dceafd0079d51afbd18':
  Shorten TARGET_BRAND from generic_<arch> to Android
 2015-11-24 22:50:50 +00:00
Ying Wang a30f140638 Merge "Fix typo." am: deeb2d2453 
am: f0522b0c34

* commit 'f0522b0c34bb6106894951262cdb7246395eb3ca':
  Fix typo.
 2015-11-24 22:21:25 +00:00
Ying Wang f0522b0c34 Merge "Fix typo." 
am: deeb2d2453

* commit 'deeb2d245397a8330890247697d01629f763ec31':
  Fix typo.
 2015-11-24 22:16:45 +00:00
Ying Wang deeb2d2453 Merge "Fix typo." 2015-11-24 22:09:49 +00:00
Ying Wang 6cce4026ff Fix typo. 
Change-Id: I299076791c620968fa7a5c420b5ca21ea4d30b51
 2015-11-24 14:09:11 -08:00
Ying Wang 929d0ee01a Merge "Don\'t delete META-INF in jack-java-to-dex when packing resources." am: 81bbac6a0f 
am: fdfd0b0d81

* commit 'fdfd0b0d8145ccead681d921cfd33ba4c57d64fc':
  Don't delete META-INF in jack-java-to-dex when packing resources.
 2015-11-24 22:04:55 +00:00
Ying Wang fdfd0b0d81 Merge "Don\'t delete META-INF in jack-java-to-dex when packing resources." 
am: 81bbac6a0f

* commit '81bbac6a0fe76f2b007f6f0c2c3dc44f85fd4dd6':
  Don't delete META-INF in jack-java-to-dex when packing resources.
 2015-11-24 22:01:54 +00:00
Ying Wang 81bbac6a0f Merge "Don't delete META-INF in jack-java-to-dex when packing resources." 2015-11-24 21:58:06 +00:00
Ying Wang 3be52e6692 Don't delete META-INF in jack-java-to-dex when packing resources. 
LOCAL_DONT_DELETE_JAR_META_INF is meant for deleting resources carried
by static Java libraries, see comment in clear_vars.mk.
For a module's own resources, we should pick up whatever in
LOCAL_JAVA_RESOURCE_DIRS.
The same applies  when building .jack from a  prebult jar in
transform-jar-to-jack.

Bug: 25860887
Change-Id: I20c120e039342a1124362c5f8747eace94b03931
(cherry-pick from commit 996ae38ffd)
 2015-11-24 13:57:10 -08:00
Chih-hung Hsieh c5a9f9cbcc Merge "Move mips64 target to clang by default." am: b0d9108795 
am: 54ac6cd527

* commit '54ac6cd527eeb9784a0703a8ef0b017e290c813c':
  Move mips64 target to clang by default.
 2015-11-24 21:22:04 +00:00
Chih-hung Hsieh 7906e14344 Merge "Move mips target to clang by default." am: 80d6b0a9c6 
am: 917f4aea1d

* commit '917f4aea1d99c9155eee218d81d3f63b9b480709':
  Move mips target to clang by default.
 2015-11-24 21:21:58 +00:00
Chih-hung Hsieh 54ac6cd527 Merge "Move mips64 target to clang by default." 
am: b0d9108795

* commit 'b0d9108795caea4b88be42d208c7a21e73de4c9f':
  Move mips64 target to clang by default.
 2015-11-24 21:17:55 +00:00
Chih-hung Hsieh 917f4aea1d Merge "Move mips target to clang by default." 
am: 80d6b0a9c6

* commit '80d6b0a9c607b15a70512996b5a56b0499e426b4':
  Move mips target to clang by default.
 2015-11-24 21:17:47 +00:00