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

7613 Commits

Author SHA1 Message Date
Colin Cross 870e0d291e am 73021682: resolved conflicts for merge of 8c25fd56 to mnc-dr-dev-plus-aosp 
* commit '73021682133ab4586975ccc826769a57403195c7':
  Read BUILD_NUMBER from file in rules
 2015-07-21 21:43:24 +00:00
Colin Cross 7302168213 resolved conflicts for merge of 8c25fd56 to mnc-dr-dev-plus-aosp 
Change-Id: Id97d2e9d2749bf5739ede583462ef83adb1ee60c
 2015-07-21 12:54:17 -07:00
Colin Cross 8c25fd565a am 1d0f6eb1: Merge "Read BUILD_NUMBER from file in rules" 
* commit '1d0f6eb115e4fd0093bd3d026264e579689a57c3':
  Read BUILD_NUMBER from file in rules
 2015-07-21 19:31:47 +00:00
Colin Cross 1d0f6eb115 Merge "Read BUILD_NUMBER from file in rules" 2015-07-21 19:20:37 +00:00
Evgenii Stepanov 08ef611b19 am 28c10817: am b8376873: am db38e7b5: Merge "Disable relocation packer in SANITIZE_TARGET mode." 
* commit '28c1081788c1861e552bfd2d93c3f6d83a0f8621':
  Disable relocation packer in SANITIZE_TARGET mode.
 2015-07-21 18:39:14 +00:00
Colin Cross f5480c0245 am a2cfb78f: resolve conflicts for merge of 89675456 into mnc-dr-dev-plus-aosp 
* commit 'a2cfb78f7931102f6f6db152664c10accf92d3c6':
  Do not update previous_XXX.mk when there is no change
 2015-07-21 18:39:11 +00:00
Evgenii Stepanov 28c1081788 am b8376873: am db38e7b5: Merge "Disable relocation packer in SANITIZE_TARGET mode." 
* commit 'b837687362903dab10afbf76f5d387586a6e264f':
  Disable relocation packer in SANITIZE_TARGET mode.
 2015-07-21 18:28:54 +00:00
Colin Cross a2cfb78f79 resolve conflicts for merge of 89675456 into mnc-dr-dev-plus-aosp 
Change-Id: Ia99e16eb83902f008960007468dd4d9fba88319a
 2015-07-21 10:56:26 -07:00
Evgenii Stepanov b837687362 am db38e7b5: Merge "Disable relocation packer in SANITIZE_TARGET mode." 
* commit 'db38e7b5d407a438d05fc300b432cc83692643d8':
  Disable relocation packer in SANITIZE_TARGET mode.
 2015-07-21 17:44:47 +00:00
Evgenii Stepanov db38e7b5d4 Merge "Disable relocation packer in SANITIZE_TARGET mode." 2015-07-21 17:30:03 +00:00
Yohann Roussel 7c6721fd14 Merge "Revert "Clean call-jack and its callers"" 2015-07-21 17:05:05 +00:00
Yohann Roussel b3b6348921 Revert "Clean call-jack and its callers" 
This reverts commit 4c1fc77c2e.

Change-Id: I4f5e3ec1e6fea66f315a9411db17de257817dcc9
 2015-07-21 16:45:51 +00:00
Yohann Roussel d79f37a940 Merge "Clean call-jack and its callers" 2015-07-21 12:54:01 +00:00
repo sync 896754566f resolved conflicts for merge of b097c416 to stage-aosp-master 
Change-Id: I3e0732ee61e5de40c53ade70ee1d9f6a4c3e77d6
 2015-07-21 12:31:17 +09:00
Dan Albert 9f1055b0c5 am cdb0684d: am 68b828e2: am f4ffafb1: Merge "Revert "Revert "Hide unwinder symbols in each binary.""" 
* commit 'cdb0684d973380aee79b99462ba32d14a0ef9335':
  Revert "Revert "Hide unwinder symbols in each binary.""
 2015-07-21 02:48:16 +00:00
Dan Albert cdb0684d97 am 68b828e2: am f4ffafb1: Merge "Revert "Revert "Hide unwinder symbols in each binary.""" 
* commit '68b828e21699d15eed9166cb37b1cc31bbcee884':
  Revert "Revert "Hide unwinder symbols in each binary.""
 2015-07-21 02:35:10 +00:00
Shinichiro Hamaji 14da1424e0 Do not update previous_XXX.mk when there is no change 
I'm adding a rule which regenerates ninja files to kati:

8666cfba20

With this regeneration rule, unnecessary re-generation will happen
when these .mk files are updated even if there are no changes in
their contents. With this patch, these .mk files are updated only
when the contents will be actually changed.

Change-Id: I4c796f9454502f6bb25019b3806ca577ea5258c1
 2015-07-21 09:40:02 +09:00
Ying Wang d37b540a39 Auto-clean host tools when switching between apps_only and platform build. 
For apps_only (also PDK build) we use prebuilt host tools in
prebuilts/sdk/tools; For platform build we use tools built from source.
Auto-clean intermediate files of these tools when build type change is
detected.

Bug: 20213206
Change-Id: I9173af322684c017fdb91a3abfbe39ecfe5650e9
(cherry-pick from commit 036b53b6de)
 2015-07-20 17:31:08 -07:00
Evgenii Stepanov 4b396e47eb Disable relocation packer in SANITIZE_TARGET mode. 
Workaround for
https://code.google.com/p/address-sanitizer/issues/detail?id=387.

Change-Id: I151c3f0eb7e2a4c92a64192a0b43ac17646eab5c
 2015-07-20 16:32:53 -07:00
Dan Albert 68b828e216 am f4ffafb1: Merge "Revert "Revert "Hide unwinder symbols in each binary.""" 
* commit 'f4ffafb1a3a2d103105650fcd9720aa390360a12':
  Revert "Revert "Hide unwinder symbols in each binary.""
 2015-07-20 23:23:58 +00:00
Dan Albert f4ffafb1a3 Merge "Revert "Revert "Hide unwinder symbols in each binary.""" 2015-07-20 23:11:59 +00:00
Yohann Roussel 4c1fc77c2e Clean call-jack and its callers 
This is possible now that we have the new Jack server.
Also fix dependency from dex/jack target to jack script
instead of jack.jar.

(cherry picked from commit 5e50b34221)

Change-Id: I5dce864624e97c27441a5ee7f8c3cd582613390e
 2015-07-21 00:22:45 +02:00
Colin Cross f37b455858 Read BUILD_NUMBER from file in rules 
Using $(BUILD_NUMBER) inside a rule causes odd behavior, as the rule
is different every time make is run, but since make doesn't depend
on the command line it only ends up being built with the new value
if some other dependency has changed.

To allow ninja, which does depend on the command line, to provide the
same behavior, store the build number in out/build_number.txt, and
use a shell expansion to cat the file in rules that use it.  This will
cause the rule command to stay identical between builds, while still
getting the new build number if the rule is rerun for a dependency.

Also use the same trick for BUILD_FINGERPRINT, and the date in
droiddoc rules.

Change-Id: I6c5e6b6b3ef4c613563d7f5604df0e401575ba5f
 2015-07-18 12:15:04 -07:00
Colin Cross 2b8f32c2ab am f37a042e: am 0f0a6b62: am 03e74d66: Merge "Move @echo to first command in rules" 
* commit 'f37a042e274b36fc54934a3faf6ecf04c3dd6bfb':
  Move @echo to first command in rules
 2015-07-17 23:30:58 +00:00
Colin Cross f37a042e27 am 0f0a6b62: am 03e74d66: Merge "Move @echo to first command in rules" 
* commit '0f0a6b62bf9e06f980d86fbd6afeaad33fef03e5':
  Move @echo to first command in rules
 2015-07-17 23:22:48 +00:00
Colin Cross 0f0a6b62bf am 03e74d66: Merge "Move @echo to first command in rules" 
* commit '03e74d66c73558b517a56be75acc9a391c676ba8':
  Move @echo to first command in rules
 2015-07-17 23:12:41 +00:00
Colin Cross b6da589f60 Move @echo to first command in rules 
Move the @echo command that prints the rule description to be the
first command in each rule so that the kati tool can find it to
use as a ninja rule description.

Change-Id: I90f27c35bb719d327a7f2109f8d00d3589082f19
 2015-07-16 17:14:27 -07:00
Ying Wang 3f6833bfd1 Merge "Add droiddoc flag LOCAL_DROIDDOC_STUB_OUT_DIR" 2015-07-16 21:36:11 +00:00
Ying Wang 5adfc3eb8b Add droiddoc flag LOCAL_DROIDDOC_STUB_OUT_DIR 
When calling droiddoc to generate stubs, if you use
LOCAL_DROIDDOC_STUB_OUT_DIR (instead of "-stubs" to
LOCAL_DROIDDOC_LOCAL_DROIDDOC_OPTIONS), the build system gets the chance
to clean up the stub out directory before calling doclava.

Bug: 22534021
Change-Id: Icb0a73eb51bfb1c1ecd88217ebcd39c27df1de29
 2015-07-16 14:23:53 -07:00
Ying Wang 7dd186c812 am a5c47569: am f943e811: am e421b10f: am e8ecab8d: Merge "Don\'t uncompress/page-align the jni libraries in apps_only build." into mnc-dev 
* commit 'a5c47569718370fbc00689098df91286a9dac805':
  Don't uncompress/page-align the jni libraries in apps_only build.
 2015-07-16 19:49:25 +00:00
Ying Wang a5c4756971 am f943e811: am e421b10f: am e8ecab8d: Merge "Don\'t uncompress/page-align the jni libraries in apps_only build." into mnc-dev 
* commit 'f943e811febec5a50493a1c7449f8cd2cbda9432':
  Don't uncompress/page-align the jni libraries in apps_only build.
 2015-07-16 19:35:50 +00:00
Ying Wang e421b10f1c am e8ecab8d: Merge "Don\'t uncompress/page-align the jni libraries in apps_only build." into mnc-dev 
* commit 'e8ecab8d099f465d527f7bc0fbd04f26ac477a93':
  Don't uncompress/page-align the jni libraries in apps_only build.
 2015-07-16 19:01:55 +00:00
Ying Wang e8ecab8d09 Merge "Don't uncompress/page-align the jni libraries in apps_only build." into mnc-dev 2015-07-16 18:51:19 +00:00
George Mount 3d8a40467e am 464827d1: am daf97ac2: am 54152d30: am 087243dd: Merge "Add data binding to built javadoc." into mnc-dev 
* commit '464827d1e8f5b51df3e6b579f9d83e11c836effb':
  Add data binding to built javadoc.
 2015-07-16 17:17:40 +00:00
George Mount 464827d1e8 am daf97ac2: am 54152d30: am 087243dd: Merge "Add data binding to built javadoc." into mnc-dev 
* commit 'daf97ac2b63ed68b34f0dfd52d9f88ff1c7bd79d':
  Add data binding to built javadoc.
 2015-07-16 15:09:40 +00:00
George Mount 54152d3062 am 087243dd: Merge "Add data binding to built javadoc." into mnc-dev 
* commit '087243ddcb61b602f4d4eb03022844021a659fda':
  Add data binding to built javadoc.
 2015-07-16 14:29:34 +00:00
George Mount 087243ddcb Merge "Add data binding to built javadoc." into mnc-dev 2015-07-16 14:18:43 +00:00
Ying Wang 1f8964d388 Don't uncompress/page-align the jni libraries in apps_only build. 
Don't uncompress/page-align the jni libraries in apps_only build,
because the apk may be run on older platforms that don't support loading
jni directly from apk.
When prebuilt apks are installed to platform build, the build system
will automatically uncompress/page-align the prebuit apks in M and
downstream, so no need to uncompress/page-align in the apps_only build
either.

Bug: 22491084
Change-Id: I67e977b2592800ae467450592069843b4e5fc466
 2015-07-15 18:34:20 -07:00
Tao Bao 0bf4e3fad3 am 6b021161: am 5a2ed731: am f737a120: Merge "Enable verbose output for add_img_to_target_files." 
* commit '6b0211616afe4eba923e98cd78c138acd0d53d84':
  Enable verbose output for add_img_to_target_files.
 2015-07-16 00:31:57 +00:00
Tao Bao 6b0211616a am 5a2ed731: am f737a120: Merge "Enable verbose output for add_img_to_target_files." 
* commit '5a2ed7314f0d6a5dd899694ecfc880cc6a414ff7':
  Enable verbose output for add_img_to_target_files.
 2015-07-16 00:13:17 +00:00
Tao Bao 5a2ed7314f am f737a120: Merge "Enable verbose output for add_img_to_target_files." 
* commit 'f737a1209841aee5ac76e39677d8ddba0115cae2':
  Enable verbose output for add_img_to_target_files.
 2015-07-16 00:02:32 +00:00
Tao Bao f737a12098 Merge "Enable verbose output for add_img_to_target_files." 2015-07-15 23:54:28 +00:00
Evgenii Stepanov eaf2efa37c am 545a6bb2: am 275e3c8c: am 2d0ec893: Merge "Use a different linker for ASan binaries." 
* commit '545a6bb2a636fe0981364749e5f00be41789a434':
  Use a different linker for ASan binaries.
 2015-07-15 20:12:00 +00:00
Evgenii Stepanov 545a6bb2a6 am 275e3c8c: am 2d0ec893: Merge "Use a different linker for ASan binaries." 
* commit '275e3c8c105e5702b25868f80983c82c668e5664':
  Use a different linker for ASan binaries.
 2015-07-15 19:59:13 +00:00
Evgenii Stepanov 275e3c8c10 am 2d0ec893: Merge "Use a different linker for ASan binaries." 
* commit '2d0ec89357e29138abc28f65876e4aaa208f961c':
  Use a different linker for ASan binaries.
 2015-07-15 19:43:45 +00:00
Tao Bao 7055791db5 Enable verbose output for add_img_to_target_files. 
Change-Id: I7246c59c79ccf6a7589c884391d0f690746fc129
 2015-07-15 11:53:39 -07:00
Evgenii Stepanov 2e00221ef5 am db511b80: am e7171190: am 832fa5d7: Merge "Disable detection of bugs on global variables." 
* commit 'db511b80760a6adb1758f3e34c05f01ab860cd70':
  Disable detection of bugs on global variables.
 2015-07-14 21:04:18 +00:00
Evgenii Stepanov db511b8076 am e7171190: am 832fa5d7: Merge "Disable detection of bugs on global variables." 
* commit 'e71711901f5395de5af64724a9d254173b298108':
  Disable detection of bugs on global variables.
 2015-07-14 20:46:19 +00:00
Evgenii Stepanov e71711901f am 832fa5d7: Merge "Disable detection of bugs on global variables." 
* commit '832fa5d7146a28a52f2c4f5f38f981f1e858ec8a':
  Disable detection of bugs on global variables.
 2015-07-14 18:13:20 +00:00
Evgenii Stepanov 8f5e67a98c Use a different linker for ASan binaries. 
Another change in bionic/linker adds linker_asan/linker_asan64 that
know where to find ASan shared libraries.
Also, include linker_asan to the required packages list when building
for ASan.

Change-Id: I8ebe7c0091bbeb0c135708a891d33d9844373d37
 2015-07-14 11:10:40 -07:00