WebSVN – DevTools – Diff – //core_devl/trunk/CFG/TOOLSET/ANDROID.PL

+#
 # Returns         : Nothing
+#
 sub ToolsetPROJECTPreBuild
+{
-    my( $name, $androidxml ,$pArgs, $auto_test, $unit_test, $pGenerated ) = @_;
+    my( $name, $androidxml ,$pArgs, $auto_test, $unit_test, $pGenerated, $project ) = @_;
+    #
+    #   Determine the populate mode
+    #   Used to limit the shared libraries that are included
+    #   In populate mode may have both -tD and -tP
+    #       Need -tD last for backward compatability
+    #
+    my @tArgs;
+    if (exists $project->{Prod} && $project->{Prod}) {
+        push @tArgs, '-t=P';
+    } elsif (exists $project->{Debug} && $project->{Debug}) {
+        push @tArgs, '-t=D';
+    } else {
+        push @tArgs, '-t=P', '-t=D';
+    }
+    #
     #   Invoke the androidBuilder in a mode so that it will populate the Eclipse project
     #   in a suitable manner.
+    #
-    #   In the build phase there is no 'debug' or 'production' phase
-    #   Assume debug - if it needs to be determined
-    #
     EnvImport( "GBE_PERL" );
     System ( '--NoShell', '--Exit', $::GBE_PERL, $androidBuilder,
              '-f', $androidxml,
              '-i', catdir( $::ScmRoot, $::ScmInterface),
-             '-t', 'D',
+             @tArgs,
              '-pn', $::Pbase,
              '-pv', $::ScmBuildVersionFull,
              '-populate',
              @{$pArgs}
            );

Subversion Repositories DevTools