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

15583 Commits

Author SHA1 Message Date
Ying Wang 732bdb28f2 Merge "Load compiler environment for a second arch." 2014-01-24 21:39:15 +00:00
Ying Wang b8e0185489 Support arch-specific LOCAL_ variables 
With those variables, you can set up different values for TARGET_ARCH
and TARGET_2ND_ARCH.
Also fixed a couple of variables.

Bug: 11654773
Change-Id: I4c7684a562cd5877d18f67d4f848b8df07d0103b

Conflicts:
	core/base_rules.mk
 2014-01-24 13:38:34 -08:00
Ying Wang 5c7fed28f2 Make sure to install the .odex when running "make <module_name>" 
Change-Id: I64195294dad15b7d379d667f4c4738c2808fd384
 2014-01-24 13:37:11 -08:00
Ying Wang dd814bf8c2 Support to build executables for TARGET_2ND_ARCH 
By default, an executable is built for TARGET_ARCH.
To build it for TARGET_2ND_ARCH in a 64bit product, use:
LOCAL_32BIT_ONLY := true
To skip a module for TARGET_2ND_ARCH, use:
LOCAL_NO_2ND_ARCH := true

Bug: 11654773
Change-Id: Ieb293d25b21024bfe1b554044df338e064ac7b46
 2014-01-24 13:36:30 -08:00
Ying Wang ec6d6262ac Replace all references to LOCAL_GENERATED_SOURCES with my_generated_sources 
Now the RS generated sources are only appended to my_generated_sources.

Bug: 11654773
Change-Id: If8dbf3c08fed0b9945dd32b8c809331c17c4bc85
 2014-01-24 13:35:47 -08:00
Ying Wang 4d2cc665ea Set up rules to build shared libraries for TARGET_2ND_ARCH 
The rules for the 2nd arch are set up in the second inclusion
of shared_library_internal.mk.
Intermediate fils of libfoo of the 2nd arch will be built into
$(PRODUCT_OUT)/obj_$(TARGET_2ND_ARCH)/SHARED_LIBRARIES/libfoo_intermediates/
and the built libfoo.so will be in
$(PRODUCT_OUT)/obj_$(TARGET_2ND_ARCH)/lib.

Bug: 11654773
Change-Id: I58bbe5a05a65f63bce6279131552f3792000716e
 2014-01-24 13:35:30 -08:00
Ying Wang 6ef6519170 Set up rules to build static libraries for TARGET_2ND_ARCH 
The rules for the 2nd arch are set up in the second inclusion
of static_library_internal.mk.
libfoo of the 2nd arch will be built into
$(PRODUCT_OUT)/obj_$(TARGET_2ND_ARCH)/libfoo_intermediates/libfoo.a.

Bug: 11654773
Change-Id: I1d92733968fc442e9225b4df5bd1b551a81d89f7
 2014-01-24 13:35:09 -08:00
Ying Wang 1d274d2686 Load compiler environment for a second arch. 
This is the first step to build 32-bit libraries in a 64-bit product.
It will work like this:
1) In the product's BoardConfig.mk, define:
TARGET_2ND_ARCH, TARGET_2ND_ARCH_VARIANT, TARGET_2ND_CPU_VARIANT.
The build system uses those variables to set up an additional compiler
environment for the second arch.

2) When parsing Android.mks, the build system sets up rules to build a
module for both the 1st arch and the 2nd arch, unless it's explicitly
asked to skip so.
Android.mk will be adapted if there is additional rule of generating
source files.
The build system will accept arch-specific LOCAL_ variables, such as
LOCAL_CFLAGS_arm, LOCAL_CFLAGS_armv7-a-neon, LOCAL_CFLAGS_cortex-a15,
LOCAL_CFLAGS_aarch64 etc. Modules use such variables to set up build for
various archs at the same time.

3) Install binary of the 2nd arch by adding "<module_name>:32" to
PRODUCT_PACKAGES. All 2nd-arch libraries linked in by "<module_name>:32"
will be installed automatically.

Bug: 11654773
Change-Id: I2df63cd5463a07bf5358bee2a109f8fb9590fe30

Conflicts:
	core/combo/TARGET_linux-arm.mk
 2014-01-24 13:34:26 -08:00
Colin Cross 194c2a39be am de89397b: am 5119fcfc: am f81cc531: am d5227a83: Merge "build: rename aarch64 target to arm64" 
* commit 'de89397b1636b9d77cbcdea1cfb347251e1d5b0c':
  build: rename aarch64 target to arm64
 2014-01-24 21:24:54 +00:00
Colin Cross de89397b16 am 5119fcfc: am f81cc531: am d5227a83: Merge "build: rename aarch64 target to arm64" 
* commit '5119fcfc2052e9f3a5d4415759fb5bf252d651e8':
  build: rename aarch64 target to arm64
 2014-01-24 20:48:20 +00:00
Colin Cross 5119fcfc20 am f81cc531: am d5227a83: Merge "build: rename aarch64 target to arm64" 
* commit 'f81cc531b41617b91ef2c46b7f2fb1bf1abb8dc7':
  build: rename aarch64 target to arm64
 2014-01-24 20:45:41 +00:00
Colin Cross f81cc531b4 am d5227a83: Merge "build: rename aarch64 target to arm64" 
* commit 'd5227a833cde624532ec34e8b25c29af001e427f':
  build: rename aarch64 target to arm64
 2014-01-24 12:42:35 -08:00
Colin Cross d5227a833c Merge "build: rename aarch64 target to arm64" 2014-01-24 20:33:59 +00:00
Colin Cross 4f0eb7d50c build: rename aarch64 target to arm64 
Rename aarch64 build targets to arm64.  The gcc toolchain is still
aarch64.

Change-Id: Ia92d8a50824e5329cf00fd6f4f92eae112b7f3a3
 2014-01-23 22:39:38 -08:00
David Turner 28e2108d9a am 82064659: am 327c3fef: am fa2c68e8: am 51c47855: Merge "Vibra: compile and stage vibrator.default on all targets" 
* commit '82064659b8c56ad72f722d96733fe0b6f9ea0002':
  Vibra: compile and stage vibrator.default on all targets
 2014-01-24 05:51:22 +00:00
David Turner af5b48d36a am 2ae1c269: am 146cce0e: am cdecaca3: am dfc140cd: Merge "Vibra: emulator: compile and stage vibrator.goldfish" 
* commit '2ae1c269a7984c72932e1797faad58587967ecdf':
  Vibra: emulator: compile and stage vibrator.goldfish
 2014-01-24 05:51:21 +00:00
David Turner 82064659b8 am 327c3fef: am fa2c68e8: am 51c47855: Merge "Vibra: compile and stage vibrator.default on all targets" 
* commit '327c3fef766052c4e8d492d2102a39deb3bdcaa4':
  Vibra: compile and stage vibrator.default on all targets
 2014-01-24 05:47:17 +00:00
David Turner 2ae1c269a7 am 146cce0e: am cdecaca3: am dfc140cd: Merge "Vibra: emulator: compile and stage vibrator.goldfish" 
* commit '146cce0ebccd5381dad9394dad350f968652c23a':
  Vibra: emulator: compile and stage vibrator.goldfish
 2014-01-24 05:47:17 +00:00
David Turner 327c3fef76 am fa2c68e8: am 51c47855: Merge "Vibra: compile and stage vibrator.default on all targets" 
* commit 'fa2c68e81a356556298f7bab21a29c14f99f3051':
  Vibra: compile and stage vibrator.default on all targets
 2014-01-24 05:44:04 +00:00
David Turner 146cce0ebc am cdecaca3: am dfc140cd: Merge "Vibra: emulator: compile and stage vibrator.goldfish" 
* commit 'cdecaca3017e902002627e68d40d09f00224baf8':
  Vibra: emulator: compile and stage vibrator.goldfish
 2014-01-24 05:44:03 +00:00
David Turner fa2c68e81a am 51c47855: Merge "Vibra: compile and stage vibrator.default on all targets" 
* commit '51c47855f01223b88e1eb134504782695867301f':
  Vibra: compile and stage vibrator.default on all targets
 2014-01-23 21:36:34 -08:00
David Turner cdecaca301 am dfc140cd: Merge "Vibra: emulator: compile and stage vibrator.goldfish" 
* commit 'dfc140cd3f31b4f02c807cc1aa6e85d8db87a324':
  Vibra: emulator: compile and stage vibrator.goldfish
 2014-01-23 21:36:33 -08:00
David Turner 51c47855f0 Merge "Vibra: compile and stage vibrator.default on all targets" 2014-01-24 05:33:09 +00:00
David Turner dfc140cd3f Merge "Vibra: emulator: compile and stage vibrator.goldfish" 2014-01-24 05:32:54 +00:00
Dirk Dougherty 17d28f805e Merge "Add preliminary support for dynamic content js and css." 2014-01-24 03:14:20 +00:00
Dirk Dougherty 1f12160606 Add preliminary support for dynamic content js and css. 
Change-Id: I1dbc92356e8d4beb712b8872e9b6cf873bdb70be
 2014-01-23 19:10:05 -08:00
Scott Main 9ee0fae1e8 add 'get started' link to the bottom of class home pages 
Change-Id: I0f4615562efca083e7d1c50bb9e9eaa2cc250ced
 2014-01-23 16:43:47 -08:00
Ying Wang e3d067926f Support arch-specific LOCAL_ variables 
With those variables, you can set up different values for TARGET_ARCH
and TARGET_2ND_ARCH.
Also fixed a couple of variables.

Bug: 11654773
Change-Id: I4c7684a562cd5877d18f67d4f848b8df07d0103b
 2014-01-23 15:12:51 -08:00
Colin Cross 83257fb304 Merge changes I5f7df519,I0e8b02f0 
* changes:
  build: use correct arm vs thumb arguments for 2nd arch builds
  build: print module that has unhandled install path
 2014-01-23 02:04:38 +00:00
Colin Cross 2958af2aeb build: use correct arm vs thumb arguments for 2nd arch builds 
Set arm_objects_mode and normal_objects_mode when building a
module for arm when it is the 2nd arch.

Change-Id: I5f7df519b6e1dde6cbf92d106681f07a58e1f1f2
 2014-01-22 17:51:07 -08:00
Ying Wang bf4324ef5c Merge "Make sure to install the .odex when running "make <module_name>"" 2014-01-23 01:44:07 +00:00
Colin Cross 18092d2d34 build: print module that has unhandled install path 
Print the name of the module that is providing an unhandled install
path.

Change-Id: I0e8b02f01de1dde715f0985034ad943f793218ba
 2014-01-22 17:34:28 -08:00
Dirk Dougherty fae3252944 am c3fb41d0: am 2171a443: am 829e4db4: am 0bb2c170: Merge commit \'bb94d790\' into manualmerge 
* commit 'c3fb41d0cd7c172934054794368587d6f62b686b':
  Support generated samples_toc.cs file.
 2014-01-23 01:09:38 +00:00
Dirk Dougherty c3fb41d0cd am 2171a443: am 829e4db4: am 0bb2c170: Merge commit \'bb94d790\' into manualmerge 
* commit '2171a443a6a6a8e6e8676bcd8a700d3ed7c09937':
  Support generated samples_toc.cs file.
 2014-01-23 01:07:34 +00:00
Dirk Dougherty 2171a443a6 am 829e4db4: am 0bb2c170: Merge commit \'bb94d790\' into manualmerge 
* commit '829e4db46fc5ea3816b7d6432b9bacb96cb68294':
  Support generated samples_toc.cs file.
 2014-01-23 01:06:14 +00:00
Dirk Dougherty 829e4db46f am 0bb2c170: Merge commit \'bb94d790\' into manualmerge 
* commit '0bb2c1702a0ca2b174b70ac2d5364548453ba524':
  Support generated samples_toc.cs file.
 2014-01-22 17:03:21 -08:00
Dirk Dougherty 0bb2c1702a Merge commit 'bb94d790' into manualmerge 
Conflicts:
	tools/droiddoc/templates-sdk/sample.cs

Change-Id: Ic1640c3620eb6b770bae7766af9ea5c64d74afe0
 2014-01-22 17:00:19 -08:00
Ying Wang d42c800621 Make sure to install the .odex when running "make <module_name>" 
Change-Id: I64195294dad15b7d379d667f4c4738c2808fd384
 2014-01-22 16:50:21 -08:00
Dirk Dougherty bb94d79028 Support generated samples_toc.cs file. 
(cherry picked from commit d239e4c9b5)

Change-Id: I3409d7d3beefaacb7d56e15a47597241d257c213
 2014-01-23 00:33:49 +00:00
Ying Wang 24807121aa am d879a53c: am b361a17f: am 3dd8a300: am dbc9eacb: Merge "Make jgrep, cgrep, resgrep not recurse into \'out\' directory." 
* commit 'd879a53c9d5078be9ddaa474d1778da420d249c0':
  Make jgrep, cgrep, resgrep not recurse into 'out' directory.
 2014-01-22 20:42:56 +00:00
Ying Wang d879a53c9d am b361a17f: am 3dd8a300: am dbc9eacb: Merge "Make jgrep, cgrep, resgrep not recurse into \'out\' directory." 
* commit 'b361a17f26f677ff7d73992982d58b6a2eaaa38d':
  Make jgrep, cgrep, resgrep not recurse into 'out' directory.
 2014-01-22 20:40:01 +00:00
Ying Wang b361a17f26 am 3dd8a300: am dbc9eacb: Merge "Make jgrep, cgrep, resgrep not recurse into \'out\' directory." 
* commit '3dd8a3004a3da8a6fe91628478540567cd15039d':
  Make jgrep, cgrep, resgrep not recurse into 'out' directory.
 2014-01-22 20:36:39 +00:00
Ying Wang 3dd8a3004a am dbc9eacb: Merge "Make jgrep, cgrep, resgrep not recurse into \'out\' directory." 
* commit 'dbc9eacb272634b5974a80457da2f3a60487882b':
  Make jgrep, cgrep, resgrep not recurse into 'out' directory.
 2014-01-22 12:34:25 -08:00
Ying Wang dbc9eacb27 Merge "Make jgrep, cgrep, resgrep not recurse into 'out' directory." 2014-01-22 20:30:06 +00:00
Narayan Kamath d2de83a984 am 5d7745dc: am 6d5b83d8: am b533bfd6: am f99a23b1: Merge "Make envsetup.sh set JAVA_HOME correctly for java7." 
* commit '5d7745dcb868ff56a7487ca55a904783dcc62936':
  Make envsetup.sh set JAVA_HOME correctly for java7.
 2014-01-22 10:59:59 +00:00
Narayan Kamath 5d7745dcb8 am 6d5b83d8: am b533bfd6: am f99a23b1: Merge "Make envsetup.sh set JAVA_HOME correctly for java7." 
* commit '6d5b83d82739ccedf50f778a06d965a61107980a':
  Make envsetup.sh set JAVA_HOME correctly for java7.
 2014-01-22 10:56:55 +00:00
Narayan Kamath 6d5b83d827 am b533bfd6: am f99a23b1: Merge "Make envsetup.sh set JAVA_HOME correctly for java7." 
* commit 'b533bfd6075de5b6ae8a26b1f4b34d12c213c4cb':
  Make envsetup.sh set JAVA_HOME correctly for java7.
 2014-01-22 10:53:43 +00:00
Narayan Kamath b533bfd607 am f99a23b1: Merge "Make envsetup.sh set JAVA_HOME correctly for java7." 
* commit 'f99a23b10f1d6d9cf12c6dd78700ab2186a1fdb4':
  Make envsetup.sh set JAVA_HOME correctly for java7.
 2014-01-22 02:50:11 -08:00
Narayan Kamath f99a23b10f Merge "Make envsetup.sh set JAVA_HOME correctly for java7." 2014-01-22 10:44:49 +00:00
Narayan Kamath 9260bba06f Make envsetup.sh set JAVA_HOME correctly for java7. 
Note that despite the location of this change, this function
is run only during "lunch" and not during ". build/envsetup.sh"

Also, make it easier to switch back and forth between java6 and 7
on the same session.

bug: 8992787

Change-Id: I56ec0ba8552b46c04204a8b96b9abc0180f7605f
 2014-01-22 10:41:08 +00:00