Check for existence of Android NDK in AndroidLinker

[builder.git] / Build

diff --git a/Build b/Build
index 2cf1583030d2280291e617f70c9c8fb86dc6d1cc..9f94ecbdea9593353fd48273e1420998518de13d 100644 (file)
--- a/Build
+++ b/Build
@@ -13,27 +13,9 @@ package "builder"
                standard CXX "c++11";
        };
 
-       library "androidtools"
-       {
-               source "plugins/android";
-               default false;
-       };
-
-       library "datatools"
-       {
-               source "plugins/datafile";
-               default false;
-       };
-
        library "libbuilder"
        {
                source "source/lib";
-               use "androidtools";
-               use "datatools";
-               build_info
-               {
-                       incpath "plugins";
-               };
                if_arch "windows"
                {
                        build_info
@@ -56,9 +38,21 @@ package "builder"
                install true;
        };
 
-       module "builtintools"
+       module "androidtools"
        {
-               source "plugins/builtin";
+               source "plugins/android";
+               install true;
+       };
+
+       module "basetools"
+       {
+               source "plugins/base";
+               install true;
+       };
+
+       module "datatools"
+       {
+               source "plugins/datafile";
                install true;
        };