From 1fc5bf353a8719d16fd9ba29a661d211bad4038f Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Fri, 6 Oct 2017 07:43:41 -0700 Subject: Revert "Revert "Move error_code.h into otautil."" This reverts commit 26436d6d6010d5323349af7e119ff8f34f85c40c to re-land "Move error_code.h into otautil.". This way it stops requiring relative path ".." in LOCAL_C_INCLUDES (uncrypt and edify). Soong doesn't accept non-local ".." in "local_include_dirs". This CL needs to land with device-specific module changes (e.g. adding the dependency on libotautil). Test: lunch aosp_{angler,bullhead,dragon,fugu,sailfish}-userdebug; mmma bootable/recovery Change-Id: If193241801af2dae73eccd31ce57cd2b81c9fd96 --- applypatch/Android.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'applypatch/Android.mk') diff --git a/applypatch/Android.mk b/applypatch/Android.mk index db72e8eee..4eb0111df 100644 --- a/applypatch/Android.mk +++ b/applypatch/Android.mk @@ -116,6 +116,7 @@ LOCAL_STATIC_LIBRARIES := \ libapplypatch \ libedify \ libotafault \ + libotautil \ libbspatch \ libbase \ libziparchive \ -- cgit v1.2.3 From e6f7f95d3493b47514a6104e11d206a455a6433e Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Wed, 4 Oct 2017 09:33:01 -0700 Subject: edify: Export the header and move to Soong. Also make matching changes to applypatch modules which include edify/expr.h. Test: mmma bootable/recovery Change-Id: Ia72be3caa010d7f56a70add2da345e631b306378 --- applypatch/Android.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'applypatch/Android.mk') diff --git a/applypatch/Android.mk b/applypatch/Android.mk index 4eb0111df..05d937004 100644 --- a/applypatch/Android.mk +++ b/applypatch/Android.mk @@ -29,6 +29,7 @@ LOCAL_C_INCLUDES := \ bootable/recovery LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/include LOCAL_STATIC_LIBRARIES := \ + libedify \ libotafault \ libbase \ libcrypto \ -- cgit v1.2.3