commit | efbdff3c75e7ae69de898c1a06991076c1f08fcf | [log] [tgz] |
---|---|---|
author | gitbuildkicker <android-build@google.com> | Wed Mar 29 07:46:44 2017 -0700 |
committer | gitbuildkicker <android-build@google.com> | Wed Mar 29 07:46:44 2017 -0700 |
tree | aa5c15196bcb0be8bc766fa4d4037f10930b2934 | |
parent | eecbfc646e546af652cee8eaa903221b15d61d4f [diff] | |
parent | 85d212f0733c43b7d01f9479102440fbc0c4a78c [diff] |
merge in oc-release history after reset to oc-dev
diff --git a/Android.mk b/Android.mk index 5f23184..ad467fd 100644 --- a/Android.mk +++ b/Android.mk
@@ -125,6 +125,9 @@ LOCAL_CFLAGS+=-O3 -Wno-unused-parameter LOCAL_CFLAGS += -DGCE_PLATFORM_SDK_VERSION=$(PLATFORM_SDK_VERSION) +ifneq ($(filter gce_x86 calypso, $(TARGET_DEVICE)),) +LOCAL_CFLAGS += -DANDROID_GCE -DSSHDIR=\"/var/run/ssh\" +endif ifneq (,$(SSHDIR)) LOCAL_CFLAGS += -DSSHDIR=\"$(SSHDIR)\"