pa-fazil
/
android_build
mirror of https://github.com/fazilsheik96/android_build.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
13,061 Commits 3 Branches 0 Tags 112 MiB
Commit Graph

13061 Commits

Author SHA1 Message Date
Ulas Kirazci 5094e33bdd Merge "Revert "Allow proto builds to pass in java proto params."" 2013-07-25 20:31:48 +00:00
Ulas Kirazci 24c7289d24 Revert "Allow proto builds to pass in java proto params." 
This reverts commit 28b46fc16c.

Change-Id: Iaca9fa749c6f460911cc46e08e6b3ae2555b8bcc
 2013-07-25 19:35:28 +00:00
Jean-Baptiste Queru be58131703 Merge "Change build id to OPENMASTER" 2013-07-25 16:01:45 +00:00
Chirayu Desai 0564d0ce33 Change build id to OPENMASTER 
Change-Id: Ib1b2ea0303619753dace8a776295ad4e1ceab096
 2013-07-25 21:26:32 +05:30
Ulas Kirazci a825aa1329 Merge "Allow proto builds to pass in java proto params." 2013-07-25 03:04:10 +00:00
Ying Wang 45339b01d6 Merge "Use consistent search depth." 2013-07-25 01:54:44 +00:00
Ulas Kirazci 28b46fc16c Allow proto builds to pass in java proto params. 
Also source files which have dependencies need to be bundled together
(at least the way the build system is set up now). Move
--proto_path=$(TOP) to the end so that it does not take precedence
over user-supplied --proto_path flags.

Change-Id: Ia532647fe8811d39230a23ba3671685b0388cbe0
 2013-07-24 18:02:57 -07:00
Guilhem IMBERTON 58570e7d5e Use consistent search depth. 
AndroidProducts.mk allows for a maxdepth of 4 in device and vendor while
vendorsetup.sh and BoardConfig.mk only allow for smaller depth.

Make search depth consistent for these files.

Change-Id: I406770c1423d4f27fe097956a7c705a0da937e35
Signed-off-by: Beare, Bruce J <bruce.j.beare@intel.com>
Signed-off-by: Laurent Fert <laurent.fert@intel.com>
Signed-off-by: Guilhem Imberton <guilhem.imberton@intel.com>
Author: Laurent Fert <laurent.fert@intel.com>
 2013-07-23 21:02:15 +02:00
Ying Wang 8bb3306b76 am a1f8cdf7: Merge "Allow several system property files" 
* commit 'a1f8cdf74bcc35110bd306d633e019a6279fc7fe':
  Allow several system property files
 2013-07-18 10:02:45 -07:00
Ying Wang a1f8cdf74b Merge "Allow several system property files" 2013-07-18 17:00:20 +00:00
The Android Open Source Project eed1a599f0 Reconcile with jb-mr2-zeroday-release - do not merge 
Change-Id: I8a36562b71e8ca51a52e9e893f3fb302ea414f24
 2013-07-16 11:19:11 -07:00
Johan Redestig 674a27ddaf Allow several system property files 
TARGET_SYSTEM_PROP now is a list of files and all of them
are included in the build.prop.

Change-Id: I494f86412b0a299ee4c066e49ab4f4686bc2178a
 2013-07-16 15:15:16 +02:00
The Android Automerger 2460df9115 JSS15B 2013-07-15 20:56:09 -07:00
Scott Main 5951d1ea0d am d67d0227: Merge changes Id6de3e74,I1e96cbd7 into jb-mr2-dev 
* commit 'd67d02274da846184449ac02aba7eafdcba889b1':
  fix design/develop boxes float
  add style to add nexus 4 frame to screenshots
 2013-07-15 14:21:00 -07:00
Scott Main d67d02274d Merge changes Id6de3e74,I1e96cbd7 into jb-mr2-dev 
* changes:
  fix design/develop boxes float
  add style to add nexus 4 frame to screenshots
 2013-07-15 21:15:26 +00:00
The Android Open Source Project ccf2f3dd14 Reconcile with jb-mr2-zeroday-release - do not merge 
Change-Id: I2c1659dba0eea86a4a76ee410608febbae466ef2
 2013-07-15 09:32:27 -07:00
Ying Wang 6e9151b1a7 am 988251c9: Fix error. 
* commit '988251c92269676c891dcb548fecdc100755b431':
  Fix $(so_suffix) error.
 2013-07-15 09:01:59 -07:00
Ying Wang 988251c922 Fix $(so_suffix) error. 
Change-Id: I32cb4d4efe0a473e67a54c035df4dd82b6e4a3f0
(cherry picked from commit 80b71fa326)
 2013-07-15 15:57:25 +00:00
The Android Automerger 566c698fe7 "JSS15" 2013-07-15 08:19:51 -07:00
The Android Automerger 3396411053 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-07-15 08:18:59 -07:00
The Android Open Source Project 8c20de34bd Reconcile with jb-mr2-zeroday-release - do not merge 
Change-Id: Id93477c002befa42eda6aafe3a71323e28ca8ab0
 2013-07-15 07:35:31 -07:00
The Android Automerger dff14e56cd "JSS11I" 2013-07-13 00:53:18 -07:00
Ying Wang 3aa8eb6810 am ba9636d4: Establish the built module dependencies on prebuilt shared library 
* commit 'ba9636d47fdc91c4caca6c9e0ad618956ddbb98b':
  Establish the built module dependencies on prebuilt shared library
 2013-07-12 22:34:46 -07:00
Ying Wang ba9636d47f Establish the built module dependencies on prebuilt shared library 
This is needed because the linker command line uses -rpath-link with
built module path ($(*_OUT_INTERMEDIATE_LIBRARIES)) to search for indirect
dependency libraries.

Change-Id: I21d537c7c697dfb18df25d3d2bb7bffe2f9d370f
(cherry picked from commit ada8f29657)
 2013-07-13 05:31:11 +00:00
Nick Kralevich 4e76f806d4 am a682f6db: am 4e132ca5: Merge "emulator: increase system partition to 550M" 
* commit 'a682f6db7b3e1259ce4abc829bd6763850565494':
  emulator: increase system partition to 550M
 2013-07-12 20:46:51 -07:00
Nick Kralevich a682f6db7b am 4e132ca5: Merge "emulator: increase system partition to 550M" 
* commit '4e132ca5e5c5048d7a95563eddd9f5ef11346678':
  emulator: increase system partition to 550M
 2013-07-12 20:44:41 -07:00
Nick Kralevich 4e132ca5e5 Merge "emulator: increase system partition to 550M" 2013-07-13 03:42:05 +00:00
Nick Kralevich 865ffd4efe emulator: increase system partition to 550M 
Yes, 400M isn't enough. I can't believe it either.

Change-Id: I7d3857f04bfda472af6a281017204672bb9c9940
 2013-07-12 20:28:59 -07:00
Scott Main e80ddbe976 fix design/develop boxes float 
Change-Id: Id6de3e74667f5cc485290509919e0f5cce689505
 2013-07-12 19:22:24 -07:00
The Android Automerger 11622182a2 "JSS11H" 2013-07-12 18:49:06 -07:00
The Android Automerger 1adb5ed7e9 "JSS11G" 2013-07-12 17:10:48 -07:00
Nick Kralevich 38437bade2 am e9ee5e11: am 5411ef9c: Merge "emulator: increase system partition size to 400M" 
* commit 'e9ee5e11b499f5be72b365585001e310b776d698':
  emulator: increase system partition size to 400M
 2013-07-12 15:17:20 -07:00
Nick Kralevich e9ee5e11b4 am 5411ef9c: Merge "emulator: increase system partition size to 400M" 
* commit '5411ef9cc4a4bf5c1950df89f2b2032edcf83dc8':
  emulator: increase system partition size to 400M
 2013-07-12 15:15:33 -07:00
Nick Kralevich 5411ef9cc4 Merge "emulator: increase system partition size to 400M" 2013-07-12 22:14:02 +00:00
The Android Open Source Project 29b708aac7 Reconcile with jb-mr2-zeroday-release - do not merge 
Change-Id: I2025eb92f81ab9ce86e3f894f3e25eb5ca4266ec
 2013-07-12 14:52:07 -07:00
Nick Kralevich de2709baac emulator: increase system partition size to 400M 
300M is too small.

Change-Id: Icbe4e76d6e5c8a50cc6e6d74e324335bc66b8466
 2013-07-12 13:44:48 -07:00
The Android Automerger 7712d0ca94 JSS11F 2013-07-12 12:19:57 -07:00
Ying Wang 263359df43 am 6685bd01: am 2476ec99: Merge "use ext4 instead of yaffs for the emulator" 
* commit '6685bd01a953a550f0cebe342e9a1125adffd6b3':
  use ext4 instead of yaffs for the emulator
 2013-07-12 11:12:49 -07:00
Ying Wang 6685bd01a9 am 2476ec99: Merge "use ext4 instead of yaffs for the emulator" 
* commit '2476ec994d449d31c89571723b4b17826639c1bf':
  use ext4 instead of yaffs for the emulator
 2013-07-12 11:11:56 -07:00
Ying Wang 2476ec994d Merge "use ext4 instead of yaffs for the emulator" 2013-07-12 18:10:13 +00:00
The Android Automerger cce09abc61 "JSS11E" 2013-07-12 10:53:23 -07:00
The Android Open Source Project 76be17de7a Reconcile with jb-mr2-zeroday-release - do not merge 
Change-Id: I5f92acba878b1d0f149df1499cc09f3cda23f7e3
 2013-07-12 07:27:32 -07:00
Nick Kralevich 3c9fae2840 use ext4 instead of yaffs for the emulator 
Bug: https://code.google.com/p/android/issues/detail?id=38561
Change-Id: I7c605457b485d169654263caf55eb7d5a9a60c2e
 2013-07-11 22:39:38 -07:00
The Android Automerger 4e9b763cf2 "JSS11D" 2013-07-11 20:26:53 -07:00
Ying Wang 032ad0542b am a1b948af: am cbeb6e81: Merge "Include ping6 in all device builds" 
* commit 'a1b948afdb5a46e168cf59ea4045b63722ee8b47':
  Include ping6 in all device builds
 2013-07-11 18:56:02 -07:00
Ying Wang a1b948afdb am cbeb6e81: Merge "Include ping6 in all device builds" 
* commit 'cbeb6e81fe8faaa1c138ebe213d2b6e7fb0ad251':
  Include ping6 in all device builds
 2013-07-11 18:52:19 -07:00
The Android Automerger 69a20402b6 JSS11C 2013-07-11 18:41:43 -07:00
The Android Automerger 29b849f196 "JSS11B" 2013-07-11 17:12:16 -07:00
Ying Wang cbeb6e81fe Merge "Include ping6 in all device builds" 2013-07-11 19:08:49 +00:00
The Android Open Source Project d8d0c17e22 Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge 
Change-Id: I5a556ab5d8ad80eb8bbff59784ea6bd1c23f7448
 2013-07-11 08:22:27 -07:00