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

15955 Commits

Author SHA1 Message Date
Ying Wang 7d50394bd7 am e1caecfa: Merge "Fix the MIPS build." 
* commit 'e1caecfaa2c9b5165e5a0f31faac1b983b5d128a':
  Fix the MIPS build.
 2014-07-17 12:30:31 +00:00
Ying Wang e1caecfaa2 Merge "Fix the MIPS build." 2014-07-16 23:31:38 +00:00
Ian Rogers 7d70f830bc Fix the MIPS build. 
Use an override for the dex2oat Xmx value when cross-compiling.
Bug: 16221224

Change-Id: Iaeac95cd50a0bae7817ee7da23b3cf25246f1d6d
 2014-07-16 18:06:02 -07:00
Ying Wang 7beaea15f0 am 15d00664: Merge "Revert "Fix Java detection on some Linux distributions"" 
* commit '15d00664884b9b8ce4766ab3a7fd15b83cbeaad9':
  Revert "Fix Java detection on some Linux distributions"
 2014-07-15 01:27:42 +00:00
Ying Wang 15d0066488 Merge "Revert "Fix Java detection on some Linux distributions"" 2014-07-15 00:42:07 +00:00
Ying Wang d28feb0066 Revert "Fix Java detection on some Linux distributions" 
This reverts commit 09040dd823.

Change-Id: Iafb126a6200e259f4176d903bacf8d3de28c6d97
 2014-07-15 01:22:50 +00:00
Ying Wang 3017e13fc8 am c7f1389d: Merge "Fix Java detection on some Linux distributions" 
* commit 'c7f1389d2683be9068d22666b484e48abcff12f1':
  Fix Java detection on some Linux distributions
 2014-07-14 21:40:49 +00:00
Stephen Hines 69a86f2f0f am 60a0ba2b: Merge "Remove bcc from generic_no_telephony.mk." 
* commit '60a0ba2b345720313d1beb0421db57ece75c063c':
  Remove bcc from generic_no_telephony.mk.
 2014-07-14 20:29:47 +00:00
Stephen Hines 29f932706d am fd5e704c: Merge "Add bcc into /system/bin." 
* commit 'fd5e704c5683077e4c689d4a27769c034b48be7f':
  Add bcc into /system/bin.
 2014-07-14 20:29:46 +00:00
Ying Wang c7f1389d26 Merge "Fix Java detection on some Linux distributions" 2014-07-14 17:15:23 +00:00
Stephen Hines fd5e704c56 Merge "Add bcc into /system/bin." 2014-07-14 16:08:11 +00:00
leozwang 01e6853556 Add bcc into /system/bin. 
Bug: 16161758
Change-Id: I492f6780ecf7d18f291532fc934a80ff7ac643cf
 2014-07-14 13:27:02 -07:00
Stephen Hines 60a0ba2b34 Merge "Remove bcc from generic_no_telephony.mk." 2014-07-14 16:03:19 +00:00
leozwang 176b0d3f86 Remove bcc from generic_no_telephony.mk. 
bcc was added into core_minimal.mk.

Change-Id: I29fa6eb3df0dada609e2f6b3e28ffd08d13c6afc
 2014-07-14 10:28:38 -07:00
Bernhard Rosenkränzer 09040dd823 Fix Java detection on some Linux distributions 
On some Linux distributions (spotted here on OpenMandriva Lx, but I'm
pretty sure some others do the same thing), "which javac" returns
/usr/bin/javac, which is a symlink to "../../etc/alternatives/javac",
which in turn points at whatever the JDK the user picked as his default.

Given "../../etc/alternatives/javac" is a relative, symlink, the next
iteration of LSLINE=$(ls -l "$JAVAC") fails (no
../../etc/alternatives/java relative to the build directory), causing
tools.jar not to be found.

Using readlink -f should work in all cases (while also simplifying the
script a bit).

Change-Id: I96afcf8e6460861bf8bb849dae05c27c42b91e84
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
 2014-07-14 10:54:58 +02:00
Nick Kralevich 8689b90bcf am 6ff84956: Merge "Fix PIC default to be -fPIC" 
* commit '6ff849568c94c53c8a722f71f33c1e688ebbed74':
  Fix PIC default to be -fPIC
 2014-07-11 01:56:46 +00:00
Colin Cross 50fb938f79 am ec5563b5: Merge "build: fix host dex2oat runtime args" 
* commit 'ec5563b55146372fe33ebd4fc13661d811b77323':
  build: fix host dex2oat runtime args
 2014-07-10 06:33:08 +00:00
Nick Kralevich 6ff849568c Merge "Fix PIC default to be -fPIC" 2014-07-10 00:35:03 +00:00
Ying Wang bc3b98012d am c4954f39: Merge "Don\'t enable LOCAL_DEX_PREOPT for apks outside system.img" 
* commit 'c4954f392e94f1877ab77ccef725a26c5d549ed1':
  Don't enable LOCAL_DEX_PREOPT for apks outside system.img
 2014-07-10 00:08:18 +00:00
Ying Wang f27e3fb4cf am c35cc93d: Merge "Allow symlinks to device or vendor tree in envsetup.sh." 
* commit 'c35cc93d3b12880ae4de00ae9ef867ab91dbc412':
  Allow symlinks to device or vendor tree in envsetup.sh.
 2014-07-10 00:08:13 +00:00
Ying Wang c4954f392e Merge "Don't enable LOCAL_DEX_PREOPT for apks outside system.img" 2014-07-09 21:46:48 +00:00
Ying Wang c35cc93d3b Merge "Allow symlinks to device or vendor tree in envsetup.sh." 2014-07-09 21:35:35 +00:00
Ying Wang 506410a549 Allow symlinks to device or vendor tree in envsetup.sh. 
Change-Id: I1190a0b1c84fa17b3692427eb6071ffbe84bc529
 2014-07-09 15:37:34 -07:00
Ying Wang edfd55ae99 Don't enable LOCAL_DEX_PREOPT for apks outside system.img 
Bug: 15621103
Change-Id: If267a4aaad17b66d9779169237e06d65d67f088f
 2014-07-09 10:57:32 -07:00
Colin Cross ec5563b551 Merge "build: fix host dex2oat runtime args" 2014-07-09 14:42:04 +00:00
Colin Cross dd2ff5541e build: fix host dex2oat runtime args 
The dalvik.vm.* properties are in PRODUCT_DEFAULT_PROPERTY_OVERRIDES,
not PRODUCT_PROPERTY_OVERRIDES.
Use $(call func,args) for user defined functions
Prepend the property contents with -Xms or -Xmx when passing to
dex2oat.  This only worked before because DEX2OAT_XMS, etc. were blank
due to the first two  bugs, which resulted in --runtime-arg --runtime-arg
and anything starting with -- as the argument to --runtime-arg is
silently ignored.

Change-Id: Ifa30038b397355171fefcc5248eea033bb634036
 2014-07-09 22:22:10 -07:00
Brian Carlstrom 8a7496060d am 02a5b517: Merge "Make dex2oat heap size product configurable [build]" 
* commit '02a5b51798b06434b08ffe2f6e6c485e73cd42bc':
  Make dex2oat heap size product configurable [build]
 2014-07-09 12:21:56 +00:00
Ying Wang ce40d5f99e am bc7501e1: Merge "More consistent use of 64-bit build variable." 
* commit 'bc7501e10324caf1318769901d8a382d46be0b60':
  More consistent use of 64-bit build variable.
 2014-07-09 12:21:48 +00:00
Brian Carlstrom 02a5b51798 Merge "Make dex2oat heap size product configurable [build]" 2014-07-08 22:56:31 +00:00
Ying Wang bc7501e103 Merge "More consistent use of 64-bit build variable." 2014-07-08 22:56:31 +00:00
Ying Wang 4b1c95d8d2 More consistent use of 64-bit build variable. 
Set up TARGET_IS_64_BIT and HOST_IS_64_BIT early so we don't need 2
mechanisms to judge if it's 64-bit build;
Remove the unnecessary 32-bit host variables.

Change-Id: I08d6d4d9ea70f91135fe2ee05463fb9a0d1cee42
 2014-07-08 18:04:17 -07:00
Elliott Hughes 1b1840cbef am af95db03: Merge "ADBS now uses stack_core code to parse traces." 
* commit 'af95db033de4808826fde12772a6d33a72dda608':
  ADBS now uses stack_core code to parse traces.
 2014-07-08 20:12:20 +00:00
Dan Albert 183f90f40c am 3ffcf184: Merge "Remove -Bsymbolic from builds." 
* commit '3ffcf184bcb61bad78f3e503ca1760e64e4d30bb':
  Remove -Bsymbolic from builds.
 2014-07-08 18:51:44 +00:00
Brian Carlstrom cffe289dc6 Make dex2oat heap size product configurable [build] 
Bug: 15919420
Change-Id: If92318a6e3d5b9c8c6a2d08a3371386fa5ad8f45
 2014-07-08 11:33:45 -07:00
Dan Albert 3ffcf184bc Merge "Remove -Bsymbolic from builds." 2014-07-08 18:09:01 +00:00
Ying Wang cd02c025ad am 979d578e: Merge "Fix host java doc by referring to the correct classpath." 
* commit '979d578ee40c0a7d3e25915049350a23165f7a5a':
  Fix host java doc by referring to the correct classpath.
 2014-07-08 00:43:42 +00:00
Ying Wang 4532289026 am d2aa51b8: Merge "Clean the last bit of LOCAL_BUILD_HOST_DEX." 
* commit 'd2aa51b8aee454baf96d8ac6d1997dd9450ae974':
  Clean the last bit of LOCAL_BUILD_HOST_DEX.
 2014-07-08 00:22:13 +00:00
Elliott Hughes af95db033d Merge "ADBS now uses stack_core code to parse traces." 2014-07-07 18:07:41 +00:00
Brigid Smith 90c66cff3a ADBS now uses stack_core code to parse traces. 
Change-Id: Ic1d822e2599fb0ad54dbe20d54e1dd6e3eaf18d6
 2014-07-07 15:14:41 -07:00
Ying Wang 979d578ee4 Merge "Fix host java doc by referring to the correct classpath." 2014-07-02 20:59:15 +00:00
Ying Wang ad7809bba4 Fix host java doc by referring to the correct classpath. 
In droiddoc for host, we don't generate classes.jar for
LOCAL_JAVA_LIBRARIES. Switch to refer to the installed jar file instead.
This is consistent with how LOCAL_JAVA_LIBRARIES for host is handled in
base_rules.mk.

Bug: 9176318
Change-Id: If7460b30ca5da28743487d66da0029a44108d556
 2014-07-07 16:50:39 -07:00
Ying Wang d2aa51b8ae Merge "Clean the last bit of LOCAL_BUILD_HOST_DEX." 2014-07-02 20:49:53 +00:00
Ying Wang f25318a5f9 Clean the last bit of LOCAL_BUILD_HOST_DEX. 
Long live LOCAL_BUILD_HOST_DEX!

Change-Id: I8de23cfc78edc554606a2e1a8a955e8bc3ad02b0
 2014-07-07 17:15:38 -07:00
Brian Carlstrom 97609d7f0b am 7b53bca0: Merge "Strip all multidex files, not just classes.dex" 
* commit '7b53bca0b925bc9f47b51afba14c3c8f064eae81':
  Strip all multidex files, not just classes.dex
 2014-07-02 16:39:23 +00:00
Ying Wang bf0a9c4ac8 am cc80f5a1: Merge "Fix partition_tag usage in install_jni_libs" 
* commit 'cc80f5a1ff4a8b751e36b7d1d5a3670f6ec12ba0':
  Fix partition_tag usage in install_jni_libs
 2014-07-02 16:15:35 +00:00
Pavel Chupin 3a8d2bf392 Fix PIC default to be -fPIC 
-fPIC is more restrictive than -fPIE, but when "-fPIC -fPIE" used together
the latter overrides. It may lead to issues when building DSO where
-fPIC and not -fPIE is required.

For executables -fPIE -pie shoudld be added and it's fine to override
-fPIC as it is done now.

The reason why we don't have these issues so far is probably related to
-Bsymbolic added by default. But any attempt to remove it reveals these
problems:
https://android-review.googlesource.com/#/c/98061/

Change-Id: If0f10628b7cc41e564221a7a37298f7d65f859a8
Signed-off-by: Pavel Chupin <pavel.v.chupin@intel.com>
 2014-07-02 13:52:21 +04:00
Ying Wang cc80f5a1ff Merge "Fix partition_tag usage in install_jni_libs" 2014-07-02 05:05:51 +00:00
Dan Willemsen 731322a90d Fix partition_tag usage in install_jni_libs 
This was expanding to TARGET_VENDOR_OUT_SHARED_LIBRARIES which was
empty. It should be expanding to TARGET_OUT_VENDOR_SHARED_LIBRARIES.

Change-Id: I32fe22e3e0b91a6d41f6a09a33d3ce2e4061d078
 2014-07-01 18:56:31 -07:00
Brian Carlstrom 7b53bca0b9 Merge "Strip all multidex files, not just classes.dex" 2014-07-01 23:33:34 +00:00
Brian Carlstrom fca814550c Strip all multidex files, not just classes.dex 
Bug: 10447095
Change-Id: I6053ca97cb0e28621262a385d57c0996e7c1aaab
 2014-07-01 23:04:36 -07:00