commit 5a216c11fbc7f76de5798a9e7fb95381305813ae
author Sen Jiang <senj@google.com> Wed Mar 30 13:08:24 2016 -0700
committer Sen Jiang <senj@google.com> Wed Apr 06 20:28:37 2016 +0000
tree 94b170edbc497e14f7bcd87f09027ee28facbca6
parent e6e4bb929acd73e57b68a30d1e3a33d76607aec3

Fix delta_generator path in integration test.

Moved delta_generator in the target to nativetests.

Test: GTEST_FILTER="DeltaPerformerIntegrationTest.*" \
    /data/nativetest/update_engine_unittests/update_engine_unittests
Test: cros_workon_make update_engine --test
Bug: 26955860

Change-Id: I0846ee3804f6a9fb1ebb82f9f1ad2578486c3882

Android.mk

diff --git a/Android.mk b/Android.mk
index afb14a6..6b63931 100644
--- a/Android.mk
+++ b/Android.mk
@@ -666,7 +666,9 @@
 
 # Build for the target.
 include $(CLEAR_VARS)
-LOCAL_MODULE := delta_generator
+LOCAL_MODULE := ue_unittest_delta_generator
+LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_NATIVE_TESTS)/update_engine_unittests
+LOCAL_MODULE_STEM := delta_generator
 LOCAL_MODULE_CLASS := EXECUTABLES
 LOCAL_CPP_EXTENSION := .cc
 LOCAL_CLANG := true
@@ -797,6 +799,7 @@
   LOCAL_MODULE_TAGS := eng
 endif
 LOCAL_REQUIRED_MODULES := \
+    ue_unittest_delta_generator \
     ue_unittest_disk_ext2_1k.img \
     ue_unittest_disk_ext2_4k.img \
     ue_unittest_disk_ext2_4k_empty.img \