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

25437 Commits

Author SHA1 Message Date
Shinichiro Hamaji 03d8b18881 Merge "Have all targets in build.ninja" 2015-09-29 06:55:33 +00:00
Shinichiro Hamaji d3701e9e96 Pass all goals to kati when "dist" is in goals 
Bug: 24339367
Change-Id: Iee80d65fe169ec005900a96446aa7a432fc68872
 2015-09-29 15:52:58 +09:00
Shinichiro Hamaji 92bbf5667d Have all targets in build.ninja 
We should pass --gen_all_targets instead of --gen_all_phony_targets
to have targets which are not declared as .PHONY.

Bug: 24384320
Change-Id: I616d8c74e6efd9d69b1a935cfc5116b716f100ff
 2015-09-29 14:18:59 +09:00
Shinichiro Hamaji bd11df9895 am 31966bdb: am ad8df5ad: Merge "Reland: Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS" 
* commit '31966bdb8c3e4c001736fc714a9baf8fa2c2acb2':
  Reland: Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS
 2015-09-29 04:08:47 +00:00
Shinichiro Hamaji 31966bdb8c am ad8df5ad: Merge "Reland: Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS" 
* commit 'ad8df5adac7d844014f74c60ce40e3cae02e5eaf':
  Reland: Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS
 2015-09-29 04:03:44 +00:00
Shinichiro Hamaji ad8df5adac Merge "Reland: Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS" 2015-09-29 03:54:59 +00:00
Colin Cross 5acaa9dca0 am 7ee3b85e: resolved conflicts for 953981db to stage-aosp-master 
* commit '7ee3b85eba08304cb9e396aaf52a77729f125532':
  Don't add dependencies on Makefiles when using ninja
 2015-09-29 01:52:46 +00:00
Colin Cross 7ee3b85eba resolved conflicts for 953981db to stage-aosp-master 
Change-Id: Ic1003a594ac5e5e91b124f249a569fb81123e973
 2015-09-28 18:45:23 -07:00
Colin Cross 953981db62 Merge "Don't add dependencies on Makefiles when using ninja" 2015-09-29 01:09:51 +00:00
Stephen Hines d11c18a4b0 Fix RS NDK usage so we always pull from "current" instead of NDK 8. 
The 8 in this definition refers to NDK release 8, not the API level 8.
Setting it to "current" is better, since it still contains the relevant
target API level (9 in our case) for using/building our RS support APIs.

Change-Id: Ib216ea859e137643fba81c39c4b9d0077ec04455
 2015-09-28 18:07:21 -07:00
Colin Cross 5c3edc045b am 98da13bb: resolved conflicts for 6c3bf1b8 to stage-aosp-master 
* commit '98da13bbd2db4b2247b90d83deec5e8befbee536':
  Use zip -q for adding shared libraries
 2015-09-28 23:49:46 +00:00
Tao Bao f6d83021d4 Pack libdivsufsort.so into otatools.zip. 
This is to support the change to bsdiff which depends on
libdivsufsort.so and libdivsufsort64.so now.

Bug: 24332905
Change-Id: I232fc1b2abda67456f012a83fa4f69a99bc6ea14
 2015-09-28 16:42:51 -07:00
Colin Cross 98da13bbd2 resolved conflicts for 6c3bf1b8 to stage-aosp-master 
Change-Id: If93ed1d9229f7fbe750f85ea4b3c3e4fce5dbb29
 2015-09-28 16:41:45 -07:00
Colin Cross a4447e8c89 Don't add dependencies on Makefiles when using ninja 
Ninja has an implicit dependency on the command being run, and kati will
regenerate the ninja manifest if any read makefile changes, so there is no
need to have dependencies on makefiles.
This won't catch all the cases where LOCAL_ADDITIONAL_DEPENDENCIES contains
a .mk file, because a few users of LOCAL_ADDITIONAL_DEPENDENCIES don't
include base_rules.mk, but it will fix the most common ones.

Bug: 23566977
Change-Id: I66de882421376303ab7233c8ce7274548f6b2199
 2015-09-28 16:29:52 -07:00
Colin Cross 6c3bf1b800 Merge "Use zip -q for adding shared libraries" 2015-09-28 23:23:40 +00:00
Colin Cross 92f8348aeb Use zip -q for adding shared libraries 
Make zip quiet when adding shared libraries to apks.

Bug: 24409581
Change-Id: I540510eb6e051b5fc9d1d2a7fa5565a5b774a602
 2015-09-28 16:15:09 -07:00
Colin Cross 3a28bb145c am e06e961c: am 7edec14c: Merge "Set BUILDING_WITH_NINJA flag when parsing makefiles for ninja build" 
* commit 'e06e961cc69b48e562f42464d4db0adc2b8d81d9':
  Set BUILDING_WITH_NINJA flag when parsing makefiles for ninja build
 2015-09-28 23:13:46 +00:00
Colin Cross e06e961cc6 am 7edec14c: Merge "Set BUILDING_WITH_NINJA flag when parsing makefiles for ninja build" 
* commit '7edec14c8dfe4e499cba0d77dc20bc985af1f586':
  Set BUILDING_WITH_NINJA flag when parsing makefiles for ninja build
 2015-09-28 23:04:57 +00:00
Shinichiro Hamaji 8b08f3a864 Reland: Only put PARSE_TIME_MAKE_GOALS into KATI_TARGETS 
Only goals that modify the parsing need to be passed to kati, filter out
everything else and only pass it to ninja.

Also, always specify --gen_all_phony_targets. With this flag, kati emits
all phony targets in the ninja file so a ninja file generated only with
PARSE_TIME_MAKE_GOALS can handle targets which don't change the parsing.

This is a reland attempt of
https://android-review.googlesource.com/#/c/172800/

The two issues should have been fixed by Ying in internal trees.

Bug: 24339367
Change-Id: I8ba2254f9bff271da2a7aa7684fd3d987e07c9d3
 2015-09-28 16:03:21 -07:00
Colin Cross 7edec14c8d Merge "Set BUILDING_WITH_NINJA flag when parsing makefiles for ninja build" 2015-09-28 23:00:46 +00:00
Colin Cross 6749338480 am 5540a746: am f262f906: Merge "Remove "preparing StaticLib" messages" 
* commit '5540a746b6bb52b6511ab58fe7c14822e23947c1':
  Remove "preparing StaticLib" messages
 2015-09-28 22:36:18 +00:00
Colin Cross fe5e6894d2 Set BUILDING_WITH_NINJA flag when parsing makefiles for ninja build 
Distinguish between parsing makefiles in make for a pre-ninja build,
parsing makefiles in kati for a ninja build, and parsing makefiles in
make for a non-ninja build by leaving USE_NINJA=true enabled for the
kati pass but also setting BUILDING_WITH_NINJA.

Change-Id: I63f1ce1efe08cd86fdf41f8051901f720b38cfaf
 2015-09-28 15:36:05 -07:00
Colin Cross 5540a746b6 am f262f906: Merge "Remove "preparing StaticLib" messages" 
* commit 'f262f906f28f1abedb32b1645b7f1ed5c0abbe45':
  Remove "preparing StaticLib" messages
 2015-09-28 22:26:54 +00:00
Colin Cross f262f906f2 Merge "Remove "preparing StaticLib" messages" 2015-09-28 22:24:02 +00:00
Colin Cross aa0aca69cf Remove "preparing StaticLib" messages 
The preparing StaticLib messages don't provide any useful information,
remove them to clean up build output.

Bug: 24409581
Change-Id: I81fa7c47fd0d10846a21667b6421b4777260d0e9
 2015-09-28 14:51:19 -07:00
Zach Jang 80dd5c72a6 am 134b372c: am 3ab46587: am 92da6bdb: am 5e858e3d: Merge "Updating PLATFORM_SECURITY_PATCH to 2015-11-01 for Nov OTA" into mnc-dev 
* commit '134b372c09ad16f9aba154e3a14ff24f11010f7a':
  Updating PLATFORM_SECURITY_PATCH to 2015-11-01 for Nov OTA
 2015-09-28 21:43:12 +00:00
Zach Jang 134b372c09 am 3ab46587: am 92da6bdb: am 5e858e3d: Merge "Updating PLATFORM_SECURITY_PATCH to 2015-11-01 for Nov OTA" into mnc-dev 
* commit '3ab46587418d647e201783af0df496f83d3e33f0':
  Updating PLATFORM_SECURITY_PATCH to 2015-11-01 for Nov OTA
 2015-09-28 21:38:18 +00:00
Zach Jang 3ab4658741 am 92da6bdb: am 5e858e3d: Merge "Updating PLATFORM_SECURITY_PATCH to 2015-11-01 for Nov OTA" into mnc-dev 
* commit '92da6bdb09e0c64996aee54da9c088f37dcc0724':
  Updating PLATFORM_SECURITY_PATCH to 2015-11-01 for Nov OTA
 2015-09-28 21:33:30 +00:00
Zach Jang 92da6bdb09 am 5e858e3d: Merge "Updating PLATFORM_SECURITY_PATCH to 2015-11-01 for Nov OTA" into mnc-dev 
* commit '5e858e3db9f7b2037dc9e03c08f9687d5a6718bd':
  Updating PLATFORM_SECURITY_PATCH to 2015-11-01 for Nov OTA
 2015-09-28 21:27:22 +00:00
Tao Bao 5b8bd02ed4 am 9a5afa52: am 5e23069b: Merge "build_image.py: Use a fixed timestamp in the generated image." 
* commit '9a5afa5242a4d179fc45f59944c0fba5ccaa4c15':
  build_image.py: Use a fixed timestamp in the generated image.
 2015-09-28 21:24:38 +00:00
Zach Jang 5e858e3db9 Merge "Updating PLATFORM_SECURITY_PATCH to 2015-11-01 for Nov OTA" into mnc-dev 2015-09-28 21:17:41 +00:00
Tao Bao 9a5afa5242 am 5e23069b: Merge "build_image.py: Use a fixed timestamp in the generated image." 
* commit '5e23069bceebfbf17f67c709bad495d707b194dc':
  build_image.py: Use a fixed timestamp in the generated image.
 2015-09-28 21:16:34 +00:00
Tao Bao 5e23069bce Merge "build_image.py: Use a fixed timestamp in the generated image." 2015-09-28 21:09:23 +00:00
Tao Bao 052ae3542b build_image.py: Use a fixed timestamp in the generated image. 
Bug: 24377993
Change-Id: I9b1433c8c877dc2a391615bb016b8970426e9f70
 2015-09-28 13:44:13 -07:00
Steve Fung 6a6f185069 am db4cba4a: am 562ad0b5: Merge "Package breakpad symbols in target files zip" 
* commit 'db4cba4a084c545e692c324abe26be33b0c3434b':
  Package breakpad symbols in target files zip
 2015-09-28 20:30:51 +00:00
Steve Fung db4cba4a08 am 562ad0b5: Merge "Package breakpad symbols in target files zip" 
* commit '562ad0b5e4f5d49fc62e72ca1d6eb18acab6e90b':
  Package breakpad symbols in target files zip
 2015-09-28 20:24:32 +00:00
Steve Fung 562ad0b5e4 Merge "Package breakpad symbols in target files zip" 2015-09-28 20:07:55 +00:00
Nicolas Geoffray b7c9f32765 Make linker configurable through environment. 
Change-Id: I152ad7b41cfa05f2f59f51c6d8bd1e427f1a1649
 2015-09-28 10:03:26 +01:00
Shinichiro Hamaji 05ae340c25 am a9bd9981: am cf448ddb: Merge "Use gomacc even for FDO build" 
* commit 'a9bd99816f768531f43367facc01fd140e43115a':
  Use gomacc even for FDO build
 2015-09-28 04:47:57 +00:00
Shinichiro Hamaji a9bd99816f am cf448ddb: Merge "Use gomacc even for FDO build" 
* commit 'cf448ddb4f95f511575e56a729e0d60a45d84e1e':
  Use gomacc even for FDO build
 2015-09-28 04:43:25 +00:00
Shinichiro Hamaji cf448ddb4f Merge "Use gomacc even for FDO build" 2015-09-28 04:38:53 +00:00
Colin Cross 06f75b5fe5 am ad4b1ef6: am 581a028f: Merge "Remove checkbuild and test from parse time goals" 
* commit 'ad4b1ef65eb0d2dd783a439732631a5d86efc7f3':
  Remove checkbuild and test from parse time goals
 2015-09-26 03:44:39 +00:00
Colin Cross ad4b1ef65e am 581a028f: Merge "Remove checkbuild and test from parse time goals" 
* commit '581a028fb562b1d877de2b82d6a08df045d73ec8':
  Remove checkbuild and test from parse time goals
 2015-09-26 03:37:54 +00:00
Colin Cross 581a028fb5 Merge "Remove checkbuild and test from parse time goals" 2015-09-26 03:33:35 +00:00
Shinichiro Hamaji 09295a82f8 Use gomacc even for FDO build 
Goma's client recognizes -fprofile-use= flag so shoulde be
compatible with Android's FDO build.

Change-Id: I0d21d6f530cd05770f8dc12e9dc33a5db49a9c7d
 2015-09-26 12:01:21 +09:00
Steve Fung dfbab49bed Package breakpad symbols in target files zip 
When BREAKPAD_GENERATE_SYMBOLS is set to true, package the breakpad
symbols into the target files zip thats generated with `make dist`.

Bug: 24165970
Change-Id: I11c0d9a9d9e159475bfdb7bc338f9e9ac60aeada
 2015-09-25 18:34:15 -07:00
Ying Wang 5a4ec4e8c0 am 3a3c21ca: am 094116f0: Merge "Remove the unnecessary rs_compatibility_jni_libs install rules." 
* commit '3a3c21cafb27b4015005f0d0ddf1acfc913d18f6':
  Remove the unnecessary rs_compatibility_jni_libs install rules.
 2015-09-26 01:12:52 +00:00
Ying Wang 3a3c21cafb am 094116f0: Merge "Remove the unnecessary rs_compatibility_jni_libs install rules." 
* commit '094116f0374da3dcba3ff1425f0cb42caf1c6d59':
  Remove the unnecessary rs_compatibility_jni_libs install rules.
 2015-09-26 01:06:38 +00:00
Ying Wang 094116f037 Merge "Remove the unnecessary rs_compatibility_jni_libs install rules." 2015-09-26 01:00:14 +00:00
Colin Cross ffd25c7f14 am 84494473: am aaa9d8dc: Merge "Fix windows build" 
* commit '8449447384a882e302861892ea6edf92ebd4d55e':
  Fix windows build
 2015-09-26 00:20:57 +00:00