Start of work to get both root and non-root versions building in the same branch/project

This commit is contained in:
Cameron Gutman
2014-10-29 22:47:47 -07:00
parent bbcdaa94a1
commit 60f35cd0aa
14 changed files with 247 additions and 40 deletions

View File

@@ -5,7 +5,7 @@ import java.net.UnknownHostException;
import java.util.concurrent.LinkedBlockingQueue;
import com.limelight.computers.ComputerManagerService;
import com.limelight.root.R;
import com.limelight.R;
import com.limelight.utils.Dialog;
import android.app.Activity;

View File

@@ -1,6 +1,6 @@
package com.limelight;
import com.limelight.root.R;
import com.limelight.R;
import com.limelight.utils.Dialog;
import android.app.Activity;

View File

@@ -12,7 +12,7 @@ import com.limelight.binding.PlatformBinding;
import com.limelight.nvstream.http.GfeHttpResponseException;
import com.limelight.nvstream.http.NvApp;
import com.limelight.nvstream.http.NvHTTP;
import com.limelight.root.R;
import com.limelight.R;
import com.limelight.utils.Dialog;
import com.limelight.utils.SpinnerDialog;

View File

@@ -14,7 +14,7 @@ import com.limelight.nvstream.StreamConfiguration;
import com.limelight.nvstream.av.video.VideoDecoderRenderer;
import com.limelight.nvstream.input.KeyboardPacket;
import com.limelight.nvstream.input.MouseButtonPacket;
import com.limelight.root.R;
import com.limelight.R;
import com.limelight.utils.Dialog;
import com.limelight.utils.SpinnerDialog;

View File

@@ -1,5 +0,0 @@
package com.limelight;
public class LimelightBuildProps {
public static final boolean ROOT_BUILD = true;
}

View File

@@ -14,7 +14,7 @@ import com.limelight.nvstream.http.NvHTTP;
import com.limelight.nvstream.http.PairingManager;
import com.limelight.nvstream.http.PairingManager.PairState;
import com.limelight.nvstream.wol.WakeOnLanSender;
import com.limelight.root.R;
import com.limelight.R;
import com.limelight.utils.Dialog;
import android.app.Activity;

View File

@@ -1,6 +1,6 @@
package com.limelight;
import com.limelight.root.R;
import com.limelight.R;
import com.limelight.utils.Dialog;
import android.os.Bundle;