StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,606 Commits 1 Branch 0 Tags
cfbcd758d8200d218e777be69cf8fc67a05e6a00
Commit Graph

3606 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xavier Ducrohet
f51f24a6ea Use the new sdk/build/tools.atree. 
As the sdk.git project is branched differently from the rest
of the platform, it's important to be able to control what
goes in the tools folder of the SDK on a per-branch basis.

Right now development/build/sdk.atree control what goes in
the tools folder (coming almost only from sdk.git) which causes
problems when the development.git and sdk.git branches are not
in sync.

Change-Id: I9158501cd68783d593e49e5fdea7f17d19b0120f
 2010-09-30 11:52:12 -07:00
Ying Wang
ed7211848a am 3c3bf677: am 0b9382c7: Separate out Proguard flag files to fix dependency. 
Merge commit '3c3bf6773ac7e2324c1d06282c625b81f799e427'

* commit '3c3bf6773ac7e2324c1d06282c625b81f799e427':
  Separate out Proguard flag files to fix dependency.
 2010-09-30 11:27:04 -07:00
Xavier Ducrohet
4b89f657ee am cbbab0d5: am ffd5087e: Use the new sdk/build/tools.atree. 
Merge commit 'cbbab0d57dfd297233b7fb52b30e0a95f3b0129e'

* commit 'cbbab0d57dfd297233b7fb52b30e0a95f3b0129e':
  Use the new sdk/build/tools.atree.
 2010-09-30 11:26:59 -07:00
Dan Bornstein
f45f708531 am a38198a5: am c8c09e28: Inform dex-preopt when the target device is a uniprocessor. 
Merge commit 'a38198a5f47d2679b476d29dce71d3f1ba17c892'

* commit 'a38198a5f47d2679b476d29dce71d3f1ba17c892':
  Inform dex-preopt when the target device is a uniprocessor.
 2010-09-30 11:25:08 -07:00
Ying Wang
3c3bf6773a am 0b9382c7: Separate out Proguard flag files to fix dependency. 
Merge commit '0b9382c792c303a93f5805adf4eba377dac01950' into gingerbread-plus-aosp

* commit '0b9382c792c303a93f5805adf4eba377dac01950':
  Separate out Proguard flag files to fix dependency.
 2010-09-30 09:31:38 -07:00
Xavier Ducrohet
cbbab0d57d am ffd5087e: Use the new sdk/build/tools.atree. 
Merge commit 'ffd5087ec81a281b1299048b4282dad593ccd703' into gingerbread-plus-aosp

* commit 'ffd5087ec81a281b1299048b4282dad593ccd703':
  Use the new sdk/build/tools.atree.
 2010-09-30 08:52:16 -07:00
Ying Wang
0b9382c792 Separate out Proguard flag files to fix dependency. 
Bug: 3048005
Change-Id: I3e77ca1082cf7c92a43b249e5c887e3fbdf4ba11
 2010-09-29 16:08:17 -07:00
Dan Bornstein
a38198a5f4 am c8c09e28: Inform dex-preopt when the target device is a uniprocessor. 
Merge commit 'c8c09e285d59f73334267deb9502c0927c616837' into gingerbread-plus-aosp

* commit 'c8c09e285d59f73334267deb9502c0927c616837':
  Inform dex-preopt when the target device is a uniprocessor.
 2010-09-29 12:53:24 -07:00
Dan Bornstein
c8c09e285d Inform dex-preopt when the target device is a uniprocessor. 
By default, dex-preopt optimizes for an SMP target.

Change-Id: Ib92552e55f5426b9b035ce862233752af090bb43
 2010-09-29 11:54:15 -07:00
Brian Carlstrom
c43ac33bcc am 73143d9d: am ea83daa3: Merge "Fix mmm to work with an ANDROID_BUILD_TOP that contains a symlink" into gingerbread 
Merge commit '73143d9dfcaca5416d46be2733bb370824b3acb2'

* commit '73143d9dfcaca5416d46be2733bb370824b3acb2':
  Fix mmm to work with an ANDROID_BUILD_TOP that contains a symlink
 2010-09-28 18:21:48 -07:00
Ying Wang
b5425fdfc8 am e52fddec: am 879779a5: Merge "framework-res is not used as regular Java library now." into gingerbread 
Merge commit 'e52fddec86a808b98bcdd033704b43a83cf569ea'

* commit 'e52fddec86a808b98bcdd033704b43a83cf569ea':
  framework-res is not used as regular Java library now.
 2010-09-28 18:21:39 -07:00
Brian Carlstrom
73143d9dfc am ea83daa3: Merge "Fix mmm to work with an ANDROID_BUILD_TOP that contains a symlink" into gingerbread 
Merge commit 'ea83daa389aea493294617232b5c34414861d701' into gingerbread-plus-aosp

* commit 'ea83daa389aea493294617232b5c34414861d701':
  Fix mmm to work with an ANDROID_BUILD_TOP that contains a symlink
 2010-09-28 17:50:49 -07:00
Brian Carlstrom
ea83daa389 Merge "Fix mmm to work with an ANDROID_BUILD_TOP that contains a symlink" into gingerbread 2010-09-28 17:45:59 -07:00
Dianne Hackborn
3afdaa8507 am 3367df34: am 2f85f654: Merge "Add location shared library to core build." into gingerbread 
Merge commit '3367df348cb8b3bd6f6ff834d5cbfebfaf20e444'

* commit '3367df348cb8b3bd6f6ff834d5cbfebfaf20e444':
  Add location shared library to core build.
 2010-09-28 17:40:09 -07:00
Ying Wang
d46905b787 am c292927f: am e1926260: Treat prebuilt SDKs and the stub as normal java libraries. 
Merge commit 'c292927f05ff6955b1e5ffe40b8b9777328eba55'

* commit 'c292927f05ff6955b1e5ffe40b8b9777328eba55':
  Treat prebuilt SDKs and the stub as normal java libraries.
 2010-09-28 17:39:46 -07:00
Ying Wang
e52fddec86 am 879779a5: Merge "framework-res is not used as regular Java library now." into gingerbread 
Merge commit '879779a5806d6e09d1c852a93dd4e1793bbd96cd' into gingerbread-plus-aosp

* commit '879779a5806d6e09d1c852a93dd4e1793bbd96cd':
  framework-res is not used as regular Java library now.
 2010-09-28 17:36:46 -07:00
Ying Wang
879779a580 Merge "framework-res is not used as regular Java library now." into gingerbread 2010-09-28 17:32:36 -07:00
Ying Wang
912f828605 framework-res is not used as regular Java library now. 
Change-Id: Ic2b8f7d7bceab3be7884eb4a7dbe721c14bd1ccb
 2010-09-28 17:27:56 -07:00
Dianne Hackborn
3367df348c am 2f85f654: Merge "Add location shared library to core build." into gingerbread 
Merge commit '2f85f654eea8255ee4acd7230e4f72fc2cdaacb5' into gingerbread-plus-aosp

* commit '2f85f654eea8255ee4acd7230e4f72fc2cdaacb5':
  Add location shared library to core build.
 2010-09-28 17:19:25 -07:00
Dianne Hackborn
2f85f654ee Merge "Add location shared library to core build." into gingerbread 2010-09-28 17:14:39 -07:00
Ying Wang
c292927f05 am e1926260: Treat prebuilt SDKs and the stub as normal java libraries. 
Merge commit 'e1926260486707b3941b5488e97307f7904d1c99' into gingerbread-plus-aosp

* commit 'e1926260486707b3941b5488e97307f7904d1c99':
  Treat prebuilt SDKs and the stub as normal java libraries.
 2010-09-28 16:25:15 -07:00
Ying Wang
e192626048 Treat prebuilt SDKs and the stub as normal java libraries. 
Change-Id: Ic5512b952d8218e63e40aeb07966de21391ef42d
 2010-09-28 16:18:03 -07:00
Dianne Hackborn
588fab8bbc Add location shared library to core build. 
Change-Id: I3ea62e2fb29611337044d4c3c10f756fb5d35f43
 2010-09-28 14:25:05 -07:00
Brian Carlstrom
c634d2c19d Fix mmm to work with an ANDROID_BUILD_TOP that contains a symlink 
Change-Id: I3dfc1aa6f10a52c2adc68259ce1cedec2ffd8f0e
 2010-09-28 13:44:39 -07:00
Ying Wang
421b46e0cb resolved conflicts for merge of 18c00c5c to master 
Change-Id: I7f6870b654e24a268a14b9c47eb8d384993273f2
 2010-09-28 10:45:54 -07:00
Brett Chabot
e54320d759 am 8e07b84f: am ef5fd0e1: Merge "Package ddmlib-prebuilt with CTS." into gingerbread 
Merge commit '8e07b84fccc1c5d7ed3c5c05b922fcb50e683c18'

* commit '8e07b84fccc1c5d7ed3c5c05b922fcb50e683c18':
  Package ddmlib-prebuilt with CTS.
 2010-09-28 09:27:26 -07:00
Jean-Baptiste Queru
05496fff27 resolved conflicts for merge of 9bfa95cf to master 
Change-Id: I70cfcd1de8a9d56900f81c174e33e433bae0508d
 2010-09-28 07:20:52 -07:00
Ying Wang
880f9e1641 am 81fcba10: am 1fdbf261: Don\'t set DISABLE_DEXPREOPT in lunch. 
Merge commit '81fcba102ea3953f525c1659914247747637ae7d'

* commit '81fcba102ea3953f525c1659914247747637ae7d':
  Don't set DISABLE_DEXPREOPT in lunch.
 2010-09-27 21:28:20 -07:00
Ying Wang
7e93b36b17 am b09173e7: am 30090e41: Set the intermediate dirs before using them. 
Merge commit 'b09173e78936f65a7f128fda2383f9ed5abce2e0'

* commit 'b09173e78936f65a7f128fda2383f9ed5abce2e0':
  Set the intermediate dirs before using them.
 2010-09-27 21:02:50 -07:00
Ying Wang
b017638629 am 5cb94751: am 9049e321: Add javalib.dex.jar to LOCAL_INTERMEDIATE_TARGETS 
Merge commit '5cb94751d7b3b6b92d07680bc0e7703f931e385b'

* commit '5cb94751d7b3b6b92d07680bc0e7703f931e385b':
  Add javalib.dex.jar to LOCAL_INTERMEDIATE_TARGETS
 2010-09-27 20:33:29 -07:00
Ying Wang
18c00c5c6a am bb2b82bd: Merge "Fix userdata partition\'s ext4 mount point to data." into gingerbread 
Merge commit 'bb2b82bd557b157fea5e280ef50ee782d15ac032' into gingerbread-plus-aosp

* commit 'bb2b82bd557b157fea5e280ef50ee782d15ac032':
  Fix userdata partition's ext4 mount point to data.
 2010-09-27 18:05:22 -07:00
Ying Wang
bb2b82bd55 Merge "Fix userdata partition's ext4 mount point to data." into gingerbread 2010-09-27 18:03:52 -07:00
Brett Chabot
8e07b84fcc am ef5fd0e1: Merge "Package ddmlib-prebuilt with CTS." into gingerbread 
Merge commit 'ef5fd0e18fd81b094b2a64a04a2333b136c6c0c2' into gingerbread-plus-aosp

* commit 'ef5fd0e18fd81b094b2a64a04a2333b136c6c0c2':
  Package ddmlib-prebuilt with CTS.
 2010-09-27 17:49:46 -07:00
Ying Wang
026f1451ce Fix userdata partition's ext4 mount point to data. 
Bug: 3041475
Change-Id: I07306cd9c90072626dfc132d6655618ae70e64be
 2010-09-27 17:49:03 -07:00
Brett Chabot
ef5fd0e18f Merge "Package ddmlib-prebuilt with CTS." into gingerbread 2010-09-27 17:47:55 -07:00
Dima Zavin
531f524256 core: Make fake packages have real installed files for proper dependencies 
Change-Id: I3145440eea0fbbd8ba22a2b3b0511f4c18f90eca
Signed-off-by: Dima Zavin <dima@android.com>
 2010-09-27 17:37:59 -07:00
Xavier Ducrohet
2daa77ee01 Package ddmlib-prebuilt with CTS. 
This ensures that CTS is using a compatible ddmlib.
 2010-09-27 17:28:39 -07:00
Jean-Baptiste Queru
9bfa95cfff am 6bc232a1: Merge "Don\'t reference CarHome and CarHomeLauncher" into gingerbread 
Merge commit '6bc232a11621740d14f517218d2599a714fb451f' into gingerbread-plus-aosp

* commit '6bc232a11621740d14f517218d2599a714fb451f':
  Don't reference CarHome and CarHomeLauncher
 2010-09-27 17:28:24 -07:00
Jean-Baptiste Queru
6bc232a116 Merge "Don't reference CarHome and CarHomeLauncher" into gingerbread 2010-09-27 17:24:02 -07:00
Jean-Baptiste Queru
102b8f46a5 Don't reference CarHome and CarHomeLauncher 
They're not actually part of AOSP

Change-Id: Iacb832173be7faa8ea22f74ca25e1fd68ef1dbdb
 2010-09-27 17:04:41 -07:00
Ying Wang
81fcba102e am 1fdbf261: Don\'t set DISABLE_DEXPREOPT in lunch. 
Merge commit '1fdbf261a0d550baaed96f5461bb014754364c16' into gingerbread-plus-aosp

* commit '1fdbf261a0d550baaed96f5461bb014754364c16':
  Don't set DISABLE_DEXPREOPT in lunch.
 2010-09-27 16:33:43 -07:00
Ying Wang
1fdbf261a0 Don't set DISABLE_DEXPREOPT in lunch. 
Because in core/main.mk WITH_DEXPREOPT is set to true only if the build OS is linux.

Change-Id: I287ab61312667f6100371d07010bcab5cfcc7e17
 2010-09-27 16:25:11 -07:00
Xavier Ducrohet
ffd5087ec8 Use the new sdk/build/tools.atree. 
As the sdk.git project is branched differently from the rest
of the platform, it's important to be able to control what
goes in the tools folder of the SDK on a per-branch basis.

Right now development/build/sdk.atree control what goes in
the tools folder (coming almost only from sdk.git) which causes
problems when the development.git and sdk.git branches are not
in sync.

Change-Id: Ia0b0ea37f8a4904b3a7f7805a552eeb499a2c0ee
 2010-09-27 15:51:32 -07:00
Jean-Baptiste Queru
8666dd63c7 Explicitly handle bluetooth files. 
This also allows to separate smartphone and nonsmartphone variants.

Change-Id: Icbd7c78a866bae32f060607f8a898d59fcd45830
 2010-09-27 15:35:33 -07:00
Ying Wang
b09173e789 am 30090e41: Set the intermediate dirs before using them. 
Merge commit '30090e41e31e7db34a1092d8173c1413c036b49d' into gingerbread-plus-aosp

* commit '30090e41e31e7db34a1092d8173c1413c036b49d':
  Set the intermediate dirs before using them.
 2010-09-27 14:59:13 -07:00
Ying Wang
30090e41e3 Set the intermediate dirs before using them. 
Change-Id: Ibdab1234ca8c5a86c5226ed71e84374c3fcd7a90
 2010-09-27 14:53:39 -07:00
Ying Wang
5cb94751d7 am 9049e321: Add javalib.dex.jar to LOCAL_INTERMEDIATE_TARGETS 
Merge commit '9049e321aec53cfb23b63bbee7c21878a087350f' into gingerbread-plus-aosp

* commit '9049e321aec53cfb23b63bbee7c21878a087350f':
  Add javalib.dex.jar to LOCAL_INTERMEDIATE_TARGETS
 2010-09-27 14:10:53 -07:00
Ying Wang
9049e321ae Add javalib.dex.jar to LOCAL_INTERMEDIATE_TARGETS 
So the its target-specific PRIVATE vars can be set properly.

Change-Id: I83b60bd56ee8523b0ba97092010c76c270b60c02
 2010-09-27 14:07:17 -07:00
Ying Wang
e874e23a3c resolved conflicts for merge of dc45f86a to master 
Change-Id: Icb49e58c1275c160715ba26d238337213e3877fe
 2010-09-27 12:05:56 -07:00
Ying Wang
dc45f86af8 am 02352378: Remove emulator-based dexpreopt logic from the build system. 
Merge commit '0235237805991b48831dc8add072a50c478b2fcb' into gingerbread-plus-aosp

* commit '0235237805991b48831dc8add072a50c478b2fcb':
  Remove emulator-based dexpreopt logic from the build system.
 2010-09-27 11:52:45 -07:00